Merge pull request #3319 from dumganhar/android-ndk-r9-fix

[Android] Fixing build errors for ndk-r9.

cocos2dx/platform/android/CCCommon.cpp

@@ -51,7 +51,7 @@ void log(const char * pszFormat, ...)
     vsnprintf(buf, MAX_LEN, pszFormat, args);
     va_end(args);
 
-    __android_log_print(ANDROID_LOG_DEBUG, "cocos2d-x debug info",  buf);
+    __android_log_print(ANDROID_LOG_DEBUG, "cocos2d-x debug info",  "%s", buf);
 }
 
 void MessageBox(const char * pszMsg, const char * pszTitle)

plugin/samples/HelloAnalytics-JS/proj.android/build_native.sh

@@ -35,6 +35,20 @@ echo "please define NDK_ROOT"
 exit 1
 fi
 
+# For compatibility of android-ndk-r9, 4.7 was removed from r9
+if [ -d "${NDK_ROOT}/toolchains/arm-linux-androideabi-4.7" ]; then
+    export NDK_TOOLCHAIN_VERSION=4.7
+    echo "The Selected NDK toolchain version was 4.7 !"
+else
+    if [ -d "${NDK_ROOT}/toolchains/arm-linux-androideabi-4.8" ]; then
+        export NDK_TOOLCHAIN_VERSION=4.8
+        echo "The Selected NDK toolchain version was 4.8 !"
+    else
+        echo "Couldn't find the gcc toolchain."
+        exit 1
+    fi
+fi
+
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # ... use paths relative to current directory
 PLUGIN_ROOT="$DIR/../../.."

plugin/samples/HelloAnalytics-JS/proj.android/jni/Application.mk

@@ -1,4 +1,4 @@
 APP_STL := gnustl_static
 APP_CPPFLAGS := -frtti -DCOCOS2D_JAVASCRIPT=1 -std=c++11
 APP_CPPFLAGS += -DCOCOS2D_DEBUG=1 -DCC_ENABLE_CHIPMUNK_INTEGRATION=1
-NDK_TOOLCHAIN_VERSION=4.7
+

plugin/samples/HelloIAP-JS/proj.android/build_native.sh

@@ -35,6 +35,20 @@ echo "please define NDK_ROOT"
 exit 1
 fi
 
+# For compatibility of android-ndk-r9, 4.7 was removed from r9
+if [ -d "${NDK_ROOT}/toolchains/arm-linux-androideabi-4.7" ]; then
+    export NDK_TOOLCHAIN_VERSION=4.7
+    echo "The Selected NDK toolchain version was 4.7 !"
+else
+    if [ -d "${NDK_ROOT}/toolchains/arm-linux-androideabi-4.8" ]; then
+        export NDK_TOOLCHAIN_VERSION=4.8
+        echo "The Selected NDK toolchain version was 4.8 !"
+    else
+        echo "Couldn't find the gcc toolchain."
+        exit 1
+    fi
+fi
+
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # ... use paths relative to current directory
 PLUGIN_ROOT="$DIR/../../.."

plugin/samples/HelloIAP-JS/proj.android/jni/Application.mk

@@ -1,4 +1,4 @@
 APP_STL := gnustl_static
 APP_CPPFLAGS := -frtti -DCOCOS2D_JAVASCRIPT=1 -std=c++11
 APP_CPPFLAGS += -DCOCOS2D_DEBUG=1 -DCC_ENABLE_CHIPMUNK_INTEGRATION=1
-NDK_TOOLCHAIN_VERSION=4.7
+

plugin/samples/HelloPlugins/proj.android/build_native.sh

@@ -35,6 +35,20 @@ echo "please define NDK_ROOT"
 exit 1
 fi
 
+# For compatibility of android-ndk-r9, 4.7 was removed from r9
+if [ -d "${NDK_ROOT}/toolchains/arm-linux-androideabi-4.7" ]; then
+    export NDK_TOOLCHAIN_VERSION=4.7
+    echo "The Selected NDK toolchain version was 4.7 !"
+else
+    if [ -d "${NDK_ROOT}/toolchains/arm-linux-androideabi-4.8" ]; then
+        export NDK_TOOLCHAIN_VERSION=4.8
+        echo "The Selected NDK toolchain version was 4.8 !"
+    else
+        echo "Couldn't find the gcc toolchain."
+        exit 1
+    fi
+fi
+
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # ... use paths relative to current directory
 PLUGIN_ROOT="$DIR/../../.."

plugin/samples/HelloPlugins/proj.android/jni/Application.mk

@@ -1,3 +1,3 @@
 APP_STL := gnustl_static
 APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCOCOS2D_DEBUG=1 -std=c++11
-NDK_TOOLCHAIN_VERSION=4.7
+

samples/Cpp/AssetsManagerTest/proj.android/build_native.sh

@@ -49,6 +49,20 @@ echo "NDK_ROOT not defined. Please define NDK_ROOT in your environment or in loc
 exit 1
 fi
 
+# For compatibility of android-ndk-r9, 4.7 was removed from r9
+if [ -d "${NDK_ROOT}/toolchains/arm-linux-androideabi-4.7" ]; then
+    export NDK_TOOLCHAIN_VERSION=4.7
+    echo "The Selected NDK toolchain version was 4.7 !"
+else
+    if [ -d "${NDK_ROOT}/toolchains/arm-linux-androideabi-4.8" ]; then
+        export NDK_TOOLCHAIN_VERSION=4.8
+        echo "The Selected NDK toolchain version was 4.8 !"
+    else
+        echo "Couldn't find the gcc toolchain."
+        exit 1
+    fi
+fi
+
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # ... use paths relative to current directory
 COCOS2DX_ROOT="$DIR/../../../.."

samples/Cpp/AssetsManagerTest/proj.android/jni/Application.mk

@@ -1,4 +1,3 @@
 APP_STL := gnustl_static
 APP_CPPFLAGS := -frtti -DCOCOS2D_JAVASCRIPT=1 -std=c++11
 APP_CPPFLAGS += -DCOCOS2D_DEBUG=1 -DCC_ENABLE_CHIPMUNK_INTEGRATION=1
-NDK_TOOLCHAIN_VERSION=4.7

samples/Cpp/HelloCpp/proj.android/build_native.sh

@@ -49,6 +49,20 @@ echo "NDK_ROOT not defined. Please define NDK_ROOT in your environment or in loc
 exit 1
 fi
 
+# For compatibility of android-ndk-r9, 4.7 was removed from r9
+if [ -d "${NDK_ROOT}/toolchains/arm-linux-androideabi-4.7" ]; then
+    export NDK_TOOLCHAIN_VERSION=4.7
+    echo "The Selected NDK toolchain version was 4.7 !"
+else
+    if [ -d "${NDK_ROOT}/toolchains/arm-linux-androideabi-4.8" ]; then
+        export NDK_TOOLCHAIN_VERSION=4.8
+        echo "The Selected NDK toolchain version was 4.8 !"
+    else
+        echo "Couldn't find the gcc toolchain."
+        exit 1
+    fi
+fi
+
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # ... use paths relative to current directory
 COCOS2DX_ROOT="$DIR/../../../.."

samples/Cpp/HelloCpp/proj.android/jni/Application.mk

@@ -1,3 +1,2 @@
 APP_STL := gnustl_static
 APP_CPPFLAGS := -frtti -DCOCOS2D_DEBUG=1 -std=c++11
-NDK_TOOLCHAIN_VERSION=4.7

samples/Cpp/SimpleGame/proj.android/build_native.sh

@@ -49,6 +49,20 @@ echo "NDK_ROOT not defined. Please define NDK_ROOT in your environment or in loc
 exit 1
 fi
 
+# For compatibility of android-ndk-r9, 4.7 was removed from r9
+if [ -d "${NDK_ROOT}/toolchains/arm-linux-androideabi-4.7" ]; then
+    export NDK_TOOLCHAIN_VERSION=4.7
+    echo "The Selected NDK toolchain version was 4.7 !"
+else
+    if [ -d "${NDK_ROOT}/toolchains/arm-linux-androideabi-4.8" ]; then
+        export NDK_TOOLCHAIN_VERSION=4.8
+        echo "The Selected NDK toolchain version was 4.8 !"
+    else
+        echo "Couldn't find the gcc toolchain."
+        exit 1
+    fi
+fi
+
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # ... use paths relative to current directory
 COCOS2DX_ROOT="$DIR/../../../.."

samples/Cpp/SimpleGame/proj.android/jni/Application.mk

@@ -1,3 +1,2 @@
 APP_STL := gnustl_static
 APP_CPPFLAGS := -frtti -DCOCOS2D_DEBUG=1 -std=c++11
-NDK_TOOLCHAIN_VERSION=4.7

samples/Cpp/TestCpp/proj.android/build_native.sh

@@ -49,6 +49,21 @@ echo "NDK_ROOT not defined. Please define NDK_ROOT in your environment or in loc
 exit 1
 fi
 
+# For compatibility of android-ndk-r9, 4.7 was removed from r9
+if [ -d "${NDK_ROOT}/toolchains/arm-linux-androideabi-4.7" ]; then
+    export NDK_TOOLCHAIN_VERSION=4.7
+    echo "The Selected NDK toolchain version was 4.7 !"
+else
+    if [ -d "${NDK_ROOT}/toolchains/arm-linux-androideabi-4.8" ]; then
+        export NDK_TOOLCHAIN_VERSION=4.8
+        echo "The Selected NDK toolchain version was 4.8 !"
+    else
+        echo "Couldn't find the gcc toolchain."
+        exit 1
+    fi
+fi
+
+
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # ... use paths relative to current directory
 COCOS2DX_ROOT="$DIR/../../../.."

samples/Cpp/TestCpp/proj.android/jni/Application.mk

@@ -1,3 +1,3 @@
 APP_STL := gnustl_static
 APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCOCOS2D_DEBUG=1 -std=c++11
-NDK_TOOLCHAIN_VERSION=4.7
+

samples/Javascript/CocosDragonJS/proj.android/build_native.sh

@@ -58,6 +58,20 @@ echo "NDK_ROOT not defined. Please define NDK_ROOT in your environment or in loc
 exit 1
 fi
 
+# For compatibility of android-ndk-r9, 4.7 was removed from r9
+if [ -d "${NDK_ROOT}/toolchains/arm-linux-androideabi-4.7" ]; then
+    export NDK_TOOLCHAIN_VERSION=4.7
+    echo "The Selected NDK toolchain version was 4.7 !"
+else
+    if [ -d "${NDK_ROOT}/toolchains/arm-linux-androideabi-4.8" ]; then
+        export NDK_TOOLCHAIN_VERSION=4.8
+        echo "The Selected NDK toolchain version was 4.8 !"
+    else
+        echo "Couldn't find the gcc toolchain."
+        exit 1
+    fi
+fi
+
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # ... use paths relative to current directory
 COCOS2DX_ROOT="$DIR/../../../.."

samples/Javascript/CocosDragonJS/proj.android/jni/Application.mk

@@ -1,4 +1,4 @@
 APP_STL := gnustl_static
 APP_CPPFLAGS := -frtti -DCOCOS2D_JAVASCRIPT=1 -std=c++11
 APP_CPPFLAGS += -DCOCOS2D_DEBUG=1 -DCC_ENABLE_CHIPMUNK_INTEGRATION=1
-NDK_TOOLCHAIN_VERSION=4.7
+

samples/Javascript/CrystalCraze/proj.android/build_native.sh

@@ -58,6 +58,20 @@ echo "NDK_ROOT not defined. Please define NDK_ROOT in your environment or in loc
 exit 1
 fi
 
+# For compatibility of android-ndk-r9, 4.7 was removed from r9
+if [ -d "${NDK_ROOT}/toolchains/arm-linux-androideabi-4.7" ]; then
+    export NDK_TOOLCHAIN_VERSION=4.7
+    echo "The Selected NDK toolchain version was 4.7 !"
+else
+    if [ -d "${NDK_ROOT}/toolchains/arm-linux-androideabi-4.8" ]; then
+        export NDK_TOOLCHAIN_VERSION=4.8
+        echo "The Selected NDK toolchain version was 4.8 !"
+    else
+        echo "Couldn't find the gcc toolchain."
+        exit 1
+    fi
+fi
+
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # ... use paths relative to current directory
 COCOS2DX_ROOT="$DIR/../../../.."

samples/Javascript/CrystalCraze/proj.android/jni/Application.mk

@@ -1,4 +1,4 @@
 APP_STL := gnustl_static
 APP_CPPFLAGS := -frtti -DCOCOS2D_JAVASCRIPT=1 -std=c++11
 APP_CPPFLAGS += -DCOCOS2D_DEBUG=1 -DCC_ENABLE_CHIPMUNK_INTEGRATION=1
-NDK_TOOLCHAIN_VERSION=4.7
+

samples/Javascript/MoonWarriors/proj.android/build_native.sh

@@ -57,6 +57,20 @@ echo "NDK_ROOT not defined. Please define NDK_ROOT in your environment or in loc
 exit 1
 fi
 
+# For compatibility of android-ndk-r9, 4.7 was removed from r9
+if [ -d "${NDK_ROOT}/toolchains/arm-linux-androideabi-4.7" ]; then
+    export NDK_TOOLCHAIN_VERSION=4.7
+    echo "The Selected NDK toolchain version was 4.7 !"
+else
+    if [ -d "${NDK_ROOT}/toolchains/arm-linux-androideabi-4.8" ]; then
+        export NDK_TOOLCHAIN_VERSION=4.8
+        echo "The Selected NDK toolchain version was 4.8 !"
+    else
+        echo "Couldn't find the gcc toolchain."
+        exit 1
+    fi
+fi
+
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # ... use paths relative to current directory
 COCOS2DX_ROOT="$DIR/../../../.."

samples/Javascript/MoonWarriors/proj.android/jni/Application.mk

@@ -1,4 +1,4 @@
 APP_STL := gnustl_static
 APP_CPPFLAGS := -frtti -DCOCOS2D_JAVASCRIPT= -std=c++11
 APP_CPPFLAGS += -DCOCOS2D_DEBUG=1 -DCC_ENABLE_CHIPMUNK_INTEGRATION=1
-NDK_TOOLCHAIN_VERSION=4.7
+

samples/Javascript/TestJavascript/proj.android/build_native.sh

@@ -57,6 +57,20 @@ echo "NDK_ROOT not defined. Please define NDK_ROOT in your environment or in loc
 exit 1
 fi
 
+# For compatibility of android-ndk-r9, 4.7 was removed from r9
+if [ -d "${NDK_ROOT}/toolchains/arm-linux-androideabi-4.7" ]; then
+    export NDK_TOOLCHAIN_VERSION=4.7
+    echo "The Selected NDK toolchain version was 4.7 !"
+else
+    if [ -d "${NDK_ROOT}/toolchains/arm-linux-androideabi-4.8" ]; then
+        export NDK_TOOLCHAIN_VERSION=4.8
+        echo "The Selected NDK toolchain version was 4.8 !"
+    else
+        echo "Couldn't find the gcc toolchain."
+        exit 1
+    fi
+fi
+
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # ... use paths relative to current directory
 COCOS2DX_ROOT="$DIR/../../../.."

samples/Javascript/TestJavascript/proj.android/jni/Application.mk

@@ -1,4 +1,4 @@
 APP_STL := gnustl_static
 APP_CPPFLAGS := -frtti -DCOCOS2D_JAVASCRIPT=1 -std=c++11
 APP_CPPFLAGS += -DCOCOS2D_DEBUG=1 -DCC_ENABLE_CHIPMUNK_INTEGRATION=1
-NDK_TOOLCHAIN_VERSION=4.7
+

samples/Javascript/WatermelonWithMe/proj.android/build_native.sh

@@ -57,6 +57,20 @@ echo "NDK_ROOT not defined. Please define NDK_ROOT in your environment or in loc
 exit 1
 fi
 
+# For compatibility of android-ndk-r9, 4.7 was removed from r9
+if [ -d "${NDK_ROOT}/toolchains/arm-linux-androideabi-4.7" ]; then
+    export NDK_TOOLCHAIN_VERSION=4.7
+    echo "The Selected NDK toolchain version was 4.7 !"
+else
+    if [ -d "${NDK_ROOT}/toolchains/arm-linux-androideabi-4.8" ]; then
+        export NDK_TOOLCHAIN_VERSION=4.8
+        echo "The Selected NDK toolchain version was 4.8 !"
+    else
+        echo "Couldn't find the gcc toolchain."
+        exit 1
+    fi
+fi
+
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # ... use paths relative to current directory
 COCOS2DX_ROOT="$DIR/../../../.."

samples/Javascript/WatermelonWithMe/proj.android/jni/Application.mk

@@ -1,4 +1,4 @@
 APP_STL := gnustl_static
 APP_CPPFLAGS := -frtti -DCOCOS2D_JAVASCRIPT=1 -std=c++11
 APP_CPPFLAGS += -DCOCOS2D_DEBUG=1 -DCC_ENABLE_CHIPMUNK_INTEGRATION=1
-NDK_TOOLCHAIN_VERSION=4.7
+

samples/Lua/HelloLua/proj.android/build_native.sh

@@ -49,6 +49,20 @@ echo "NDK_ROOT not defined. Please define NDK_ROOT in your environment or in loc
 exit 1
 fi
 
+# For compatibility of android-ndk-r9, 4.7 was removed from r9
+if [ -d "${NDK_ROOT}/toolchains/arm-linux-androideabi-4.7" ]; then
+    export NDK_TOOLCHAIN_VERSION=4.7
+    echo "The Selected NDK toolchain version was 4.7 !"
+else
+    if [ -d "${NDK_ROOT}/toolchains/arm-linux-androideabi-4.8" ]; then
+        export NDK_TOOLCHAIN_VERSION=4.8
+        echo "The Selected NDK toolchain version was 4.8 !"
+    else
+        echo "Couldn't find the gcc toolchain."
+        exit 1
+    fi
+fi
+
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # ... use paths relative to current directory
 COCOS2DX_ROOT="$DIR/../../../.."

samples/Lua/HelloLua/proj.android/jni/Application.mk

@@ -1,4 +1,4 @@
 APP_STL := gnustl_static
 APP_CPPFLAGS := -frtti -DCOCOS2D_DEBUG=1 -std=c++11
 APP_CPPFLAGS += -fexceptions
-NDK_TOOLCHAIN_VERSION=4.7
+

samples/Lua/TestLua/proj.android/build_native.sh

@@ -49,6 +49,21 @@ echo "NDK_ROOT not defined. Please define NDK_ROOT in your environment or in loc
 exit 1
 fi
 
+# For compatibility of android-ndk-r9, 4.7 was removed from r9
+if [ -d "${NDK_ROOT}/toolchains/arm-linux-androideabi-4.7" ]; then
+    export NDK_TOOLCHAIN_VERSION=4.7
+    echo "The Selected NDK toolchain version was 4.7 !"
+else
+    if [ -d "${NDK_ROOT}/toolchains/arm-linux-androideabi-4.8" ]; then
+        export NDK_TOOLCHAIN_VERSION=4.8
+        echo "The Selected NDK toolchain version was 4.8 !"
+    else
+        echo "Couldn't find the gcc toolchain."
+        exit 1
+    fi
+fi
+
+
 if [ -z "${COCOS2DX_ROOT+aaa}" ]; then
 # ... if COCOS2DX_ROOT is not set
 # ... find current working directory

samples/Lua/TestLua/proj.android/jni/Application.mk

@@ -1,4 +1,4 @@
 APP_STL := gnustl_static
 APP_CPPFLAGS := -frtti -DCOCOS2D_DEBUG=1 -std=c++11
 APP_CPPFLAGS += -fexceptions
-NDK_TOOLCHAIN_VERSION=4.7
+

template/multi-platform-cpp/proj.android/build_native.sh

@@ -35,6 +35,20 @@ echo "please define NDK_ROOT"
 exit 1
 fi
 
+# For compatibility of android-ndk-r9, 4.7 was removed from r9
+if [ -d "${NDK_ROOT}/toolchains/arm-linux-androideabi-4.7" ]; then
+	export NDK_TOOLCHAIN_VERSION=4.7
+	echo "The Selected NDK toolchain version was 4.7 !"
+else
+	if [ -d "${NDK_ROOT}/toolchains/arm-linux-androideabi-4.8" ]; then
+		export NDK_TOOLCHAIN_VERSION=4.8
+		echo "The Selected NDK toolchain version was 4.8 !"
+	else
+		echo "Couldn't find the gcc toolchain."
+		exit 1
+	fi
+fi
+
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # ... use paths relative to current directory
 COCOS2DX_ROOT="$DIR/../../.."

template/multi-platform-cpp/proj.android/jni/Application.mk

@@ -1,3 +1,2 @@
 APP_STL := gnustl_static
 APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCOCOS2D_DEBUG=1 -std=c++11
-NDK_TOOLCHAIN_VERSION=4.7

template/multi-platform-js/proj.android/build_native.sh

@@ -43,6 +43,20 @@ echo "please define NDK_ROOT"
 exit 1
 fi
 
+# For compatibility of android-ndk-r9, 4.7 was removed from r9
+if [ -d "${NDK_ROOT}/toolchains/arm-linux-androideabi-4.7" ]; then
+    export NDK_TOOLCHAIN_VERSION=4.7
+    echo "The Selected NDK toolchain version was 4.7 !"
+else
+    if [ -d "${NDK_ROOT}/toolchains/arm-linux-androideabi-4.8" ]; then
+        export NDK_TOOLCHAIN_VERSION=4.8
+        echo "The Selected NDK toolchain version was 4.8 !"
+    else
+        echo "Couldn't find the gcc toolchain."
+        exit 1
+    fi
+fi
+
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # ... use paths relative to current directory
 COCOS2DX_ROOT="$DIR/../../.."

template/multi-platform-js/proj.android/jni/Application.mk

@@ -1,4 +1,4 @@
 APP_STL := gnustl_static
 APP_CPPFLAGS := -frtti -DCOCOS2D_JAVASCRIPT=1
 APP_CPPFLAGS += -DCOCOS2D_DEBUG=1 -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11
-NDK_TOOLCHAIN_VERSION=4.7
+

template/multi-platform-lua/proj.android/build_native.sh

@@ -35,6 +35,20 @@ echo "please define NDK_ROOT"
 exit 1
 fi
 
+# For compatibility of android-ndk-r9, 4.7 was removed from r9
+if [ -d "${NDK_ROOT}/toolchains/arm-linux-androideabi-4.7" ]; then
+    export NDK_TOOLCHAIN_VERSION=4.7
+    echo "The Selected NDK toolchain version was 4.7 !"
+else
+    if [ -d "${NDK_ROOT}/toolchains/arm-linux-androideabi-4.8" ]; then
+        export NDK_TOOLCHAIN_VERSION=4.8
+        echo "The Selected NDK toolchain version was 4.8 !"
+    else
+        echo "Couldn't find the gcc toolchain."
+        exit 1
+    fi
+fi
+
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # ... use paths relative to current directory
 COCOS2DX_ROOT="$DIR/../../.."

template/multi-platform-lua/proj.android/jni/Application.mk

@@ -1,4 +1,4 @@
 APP_STL := gnustl_static
 APP_CPPFLAGS := -frtti -DCOCOS2D_DEBUG=1 -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11
 APP_CPPFLAGS += -fexceptions
-NDK_TOOLCHAIN_VERSION=4.7
+