diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2019-07-18 05:30:21 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2019-07-18 06:39:00 -0700 |
| commit | 658ac2bb788bb3617972d6108ef6fe6a277ef3ae (patch) | |
| tree | 2c8a52f167d4ea4d0c944b296fe5c30cb807539a /packaging/android/build.sh | |
| parent | 2f6ad092a58b691170cb97eeb863f87a5504a0b0 (diff) | |
| download | subsurface-658ac2bb788bb3617972d6108ef6fe6a277ef3ae.tar.gz | |
Android: small change to keep exports together
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>
Diffstat (limited to 'packaging/android/build.sh')
| -rwxr-xr-x | packaging/android/build.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packaging/android/build.sh b/packaging/android/build.sh index 8ac5f650e..4be1c4fc9 100755 --- a/packaging/android/build.sh +++ b/packaging/android/build.sh @@ -87,6 +87,7 @@ export ARCH # Configure where we can find things here export ANDROID_NDK_ROOT=${ANDROID_NDK_ROOT-$SUBSURFACE_SOURCE/../${ANDROID_NDK}} +export ANDROID_NDK_HOME=$ANDROID_NDK_ROOT if [ -n "${QT5_ANDROID+X}" ] ; then echo "Using Qt5 in $QT5_ANDROID" @@ -243,7 +244,6 @@ if [ "$QUICK" = "" ] ; then cp -r openssl/* openssl-build-"$ARCH" pushd openssl-build-"$ARCH" 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. env PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH \ CC=clang \ |