Merge pull request #1159 from joshuastray/develop-2

Fix ndk r10c compilation

Author: pandamicro

build/android-build.py

@@ -82,9 +82,9 @@ def do_build(cocos_root, ndk_root, app_android_root, ndk_build_param,sdk_root,an
 
     num_of_cpu = get_num_of_cpu()
     if ndk_build_param == None:
-        command = '%s -j%d -C %s NDK_DEBUG=%d %s' % (ndk_path, num_of_cpu, app_android_root, build_mode=='debug', ndk_module_path)
+        command = '%s -j%d -C %s NDK_TOOLCHAIN_VERSION=4.8 NDK_DEBUG=%d %s' % (ndk_path, num_of_cpu, app_android_root, build_mode=='debug', ndk_module_path)
     else:
-        command = '%s -j%d -C %s NDK_DEBUG=%d %s %s' % (ndk_path, num_of_cpu, app_android_root, build_mode=='debug', ndk_build_param, ndk_module_path)
+        command = '%s -j%d -C %s NDK_TOOLCHAIN_VERSION=4.8 NDK_DEBUG=%d %s %s' % (ndk_path, num_of_cpu, app_android_root, build_mode=='debug', ndk_build_param, ndk_module_path)
     print command
     if os.system(command) != 0:
         raise Exception("Build dynamic library for project [ " + app_android_root + " ] fails!")

frameworks/js-bindings/external/spidermonkey/prebuilt/android/armeabi-v7a/libjs_static.a

@@ -1,9 +1,5 @@
 APP_STL := gnustl_static
 
-#use clang by default, uncomment next line to use gcc4.8
-#NDK_TOOLCHAIN_VERSION=4.8
-NDK_TOOLCHAIN_VERSION=clang
-
 APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
 APP_LDFLAGS := -latomic
 

frameworks/js-bindings/external/spidermonkey/prebuilt/android/armeabi/libjs_static.a

@@ -1,9 +1,5 @@
 APP_STL := gnustl_static
 
-#use clang by default, uncomment next line to use gcc4.8
-#NDK_TOOLCHAIN_VERSION=4.8
-NDK_TOOLCHAIN_VERSION=clang
-
 APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
 APP_LDFLAGS := -latomic
 

frameworks/js-bindings/external/spidermonkey/prebuilt/android/x86/libjs_static.a

@@ -1,9 +1,5 @@
 APP_STL := gnustl_static
 
-#use clang by default, uncomment next line to use gcc4.8
-#NDK_TOOLCHAIN_VERSION=4.8
-NDK_TOOLCHAIN_VERSION=clang
-
 APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
 APP_LDFLAGS := -latomic
 

samples/js-moonwarriors/project/proj.android/jni/Application.mk

@@ -1,9 +1,5 @@
 APP_STL := gnustl_static
 
-#use clang by default, uncomment next line to use gcc4.8
-#NDK_TOOLCHAIN_VERSION=4.8
-NDK_TOOLCHAIN_VERSION=clang
-
 APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
 APP_LDFLAGS := -latomic