From fa961a60287c07562cc8ec5245c0229a5897814c Mon Sep 17 00:00:00 2001 From: Christofer Bertonha Date: Mon, 16 Apr 2012 17:06:08 -0300 Subject: [PATCH 1/3] Workaround for work with Android NDK 7b and 7c --- distribute.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distribute.sh b/distribute.sh index f7bdf4dfc4..653917e8f2 100755 --- a/distribute.sh +++ b/distribute.sh @@ -99,7 +99,7 @@ function push_arm() { # this must be something depending of the API level of Android export PATH="$ANDROIDNDK/toolchains/arm-eabi-4.4.0/prebuilt/linux-x86/bin/:$ANDROIDNDK:$ANDROIDSDK/tools:$PATH" - if [ "X$ANDROIDNDKVER" == "Xr7" ]; then + if [ "X$ANDROIDNDKVER{:0:2}" == "Xr7" ]; then export TOOLCHAIN_PREFIX=arm-linux-androideabi export TOOLCHAIN_VERSION=4.4.3 elif [ "X$ANDROIDNDKVER" == "Xr5b" ]; then From 9b855b2df9a8782707c758faf19173d355990837 Mon Sep 17 00:00:00 2001 From: Christofer Bertonha Date: Mon, 16 Apr 2012 17:13:19 -0300 Subject: [PATCH 2/3] build with the API level setted in bash --- src/build.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/build.py b/src/build.py index af8ae33396..7b93a7d99a 100755 --- a/src/build.py +++ b/src/build.py @@ -242,8 +242,9 @@ def make_package(args): args=args) # Update the project to a recent version. + android_api = 'android-%s' % os.environ.get('ANDROIDAPI', '8') try: - subprocess.call([ANDROID, 'update', 'project', '-p', '.', '-t', 'android-8']) + subprocess.call([ANDROID, 'update', 'project', '-p', '.', '-t', android_api]) except (OSError, IOError): print 'An error occured while calling', ANDROID, 'update' print 'Your PATH must include android tools.' From f355f752f45905d841e9a7efb4c16526e852bd1c Mon Sep 17 00:00:00 2001 From: Christofer Bertonha Date: Mon, 16 Apr 2012 17:16:47 -0300 Subject: [PATCH 3/3] typo in distribute.sh --- distribute.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distribute.sh b/distribute.sh index 653917e8f2..32bb664642 100755 --- a/distribute.sh +++ b/distribute.sh @@ -99,7 +99,7 @@ function push_arm() { # this must be something depending of the API level of Android export PATH="$ANDROIDNDK/toolchains/arm-eabi-4.4.0/prebuilt/linux-x86/bin/:$ANDROIDNDK:$ANDROIDSDK/tools:$PATH" - if [ "X$ANDROIDNDKVER{:0:2}" == "Xr7" ]; then + if [ "X${ANDROIDNDKVER:0:2}" == "Xr7" ]; then export TOOLCHAIN_PREFIX=arm-linux-androideabi export TOOLCHAIN_VERSION=4.4.3 elif [ "X$ANDROIDNDKVER" == "Xr5b" ]; then