[Android] Do the ANDROID_HOME export in the makefile instead

Ludovic Fauvet git at videolan.org
Tue Oct 30 11:52:41 CET 2012


vlc-ports/android | branch: master | Ludovic Fauvet <etix at videolan.org> | Tue Oct 30 11:52:03 2012 +0100| [b1fc5f7d1e0bb335627f90ec0925df3cf8851eae] | committer: Ludovic Fauvet

Do the ANDROID_HOME export in the makefile instead

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=b1fc5f7d1e0bb335627f90ec0925df3cf8851eae
---

 Makefile   |    2 ++
 compile.sh |    3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 1c1ebeb..032e456 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,7 @@
 # Sources and objects
 
+export ANDROID_HOME=$(ANDROID_SDK)
+
 ARCH = $(ANDROID_ABI)
 
 SRC=vlc-android
diff --git a/compile.sh b/compile.sh
index ace45cc..f2f32a5 100755
--- a/compile.sh
+++ b/compile.sh
@@ -12,9 +12,6 @@ if [ -z "$ANDROID_NDK" -o -z "$ANDROID_SDK" -o -z "$ANDROID_ABI" ]; then
    echo "ANDROID_ABI should match your ABI: armeabi-v7a, armeabi or ..."
    exit 1
 fi
-
-export ANDROID_HOME=$ANDROID_SDK
-
 # try to detect NDK version
 REL=$(grep -o '^r[0-9]*.*' $ANDROID_NDK/RELEASE.TXT 2>/dev/null|cut -b2-)
 case "$REL" in



More information about the Android mailing list