From 658ac2bb788bb3617972d6108ef6fe6a277ef3ae Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Thu, 18 Jul 2019 05:30:21 -0700 Subject: Android: small change to keep exports together Simply move that export to the top of the file with the others. Suggested-by: Anton Lundin Signed-off-by: Dirk Hohndel --- packaging/android/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packaging') 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 \ -- cgit v1.2.3-70-g09d2