diff --git a/android/common_custom_rules.xml b/android/common_custom_rules.xml index 0f62fbc8c0..91843053ac 100644 --- a/android/common_custom_rules.xml +++ b/android/common_custom_rules.xml @@ -1,6 +1,9 @@ + + + @@ -22,21 +25,21 @@ - - - + + + - - - + + + - - - + + + diff --git a/android/custom_rules.xml b/android/custom_rules.xml index b37de27d6c..b25868950f 100644 --- a/android/custom_rules.xml +++ b/android/custom_rules.xml @@ -1,6 +1,30 @@ + + + + + + + + + + + + + + + + + + ************************************************ + ***** BUILDING THE FOLLOWING ARCHITECTURES ***** + ***** ${mwm.ndk.abi} + ************************************************ + + + @@ -9,8 +33,9 @@ - + + @@ -85,7 +110,7 @@ - + @@ -102,17 +127,17 @@ - + - - + + - - + + diff --git a/android/jni/Application.mk b/android/jni/Application.mk index bdaf09065b..53cf81800b 100644 --- a/android/jni/Application.mk +++ b/android/jni/Application.mk @@ -1,5 +1,11 @@ APP_PLATFORM := android-5 -APP_ABI := armeabi armeabi-v7a mips x86 + +ifeq (x$(NDK_ABI_TO_BUILD), x) + APP_ABI := armeabi armeabi-v7a mips x86 +else + APP_ABI := $(NDK_ABI_TO_BUILD) +endif + APP_STL := gnustl_static LOCAL_PATH := $(call my-dir) APP_CFLAGS += -I$(LOCAL_PATH)/../../3party/boost diff --git a/tools/autobuild/android.sh b/tools/autobuild/android.sh index 5bb8587abb..a05e7af647 100644 --- a/tools/autobuild/android.sh +++ b/tools/autobuild/android.sh @@ -22,9 +22,14 @@ SHADOW_DIR_BASE="$LOCAL_DIRNAME/../../../omim-android" export NDK_ROOT=$(GetNdkRoot) || ( echo "Can't read NDK root path from android/local.properties"; exit 1 ) export NDK_HOST=$(GetNdkHost) || ( echo "Can't get your OS type, please check tools/autobuild/ndk_helper.sh script"; exit 1 ) -NDK_ABI_TO_BUILD=(armeabi armeabi-v7a mips x86) +NDK_ABI_LIST=(armeabi armeabi-v7a mips x86) -for abi in "${NDK_ABI_TO_BUILD[@]}"; do +if test "${NDK_ABI_TO_BUILD+set}" == set +then + NDK_ABI_LIST=($NDK_ABI_TO_BUILD); +fi + +for abi in "${NDK_ABI_LIST[@]}"; do SHADOW_DIR="${SHADOW_DIR_BASE}-${CONFIGURATION}-${abi}" if [[ $# > 1 && "$2" == "clean" ]] ; then echo "Cleaning $CONFIGURATION-$abi configuration..."