mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Android: small change to keep exports together

Browse source 
Simply move that export to the top of the file with the others.

Suggested-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2019-07-18 05:30:21 -07:00
parent 2f6ad092a5
commit 658ac2bb78
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packaging/android/build.sh
View file

@ -87,6 +87,7 @@ export ARCH
# Configure where we can find things here # Configure where we can find things here
export ANDROID_NDK_ROOT=${ANDROID_NDK_ROOT-$SUBSURFACE_SOURCE/../${ANDROID_NDK}} export ANDROID_NDK_ROOT=${ANDROID_NDK_ROOT-$SUBSURFACE_SOURCE/../${ANDROID_NDK}}
export ANDROID_NDK_HOME=$ANDROID_NDK_ROOT
if [ -n "${QT5_ANDROID+X}" ] ; then if [ -n "${QT5_ANDROID+X}" ] ; then
echo "Using Qt5 in $QT5_ANDROID" echo "Using Qt5 in $QT5_ANDROID"
@ -243,7 +244,6 @@ if [ "$QUICK" = "" ] ; then
cp -r openssl/* openssl-build-"$ARCH" cp -r openssl/* openssl-build-"$ARCH"
pushd openssl-build-"$ARCH" pushd openssl-build-"$ARCH"
perl -pi -e 's/-mandroid//g' Configure perl -pi -e 's/-mandroid//g' Configure
export ANDROID_NDK_HOME=$ANDROID_NDK_ROOT
# Use env to make all these temporary, so they don't pollute later builds. # Use env to make all these temporary, so they don't pollute later builds.
env PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH \ env PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH \
CC=clang \ CC=clang \