diff --git a/cocos/3d/Android.mk b/cocos/3d/Android.mk
index 313b961750..8ac86d0ec6 100644
--- a/cocos/3d/Android.mk
+++ b/cocos/3d/Android.mk
@@ -2,6 +2,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := cocos3d_static
+LOCAL_ARM_MODE := arm
 
 LOCAL_MODULE_FILENAME := libcocos3d
 
diff --git a/cocos/Android.mk b/cocos/Android.mk
index c6d42a96df..582a095a06 100644
--- a/cocos/Android.mk
+++ b/cocos/Android.mk
@@ -6,9 +6,7 @@ LOCAL_MODULE := cocos2dx_internal_static
 
 LOCAL_MODULE_FILENAME := libcocos2dxinternal
 
-ifeq ($(USE_ARM_MODE),1)
 LOCAL_ARM_MODE := arm
-endif
 
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
 MATHNEONFILE := math/MathUtil.cpp.neon
diff --git a/cocos/editor-support/cocosbuilder/Android.mk b/cocos/editor-support/cocosbuilder/Android.mk
index 0406e4d578..7131e13933 100644
--- a/cocos/editor-support/cocosbuilder/Android.mk
+++ b/cocos/editor-support/cocosbuilder/Android.mk
@@ -5,9 +5,7 @@ LOCAL_MODULE := cocosbuilder_static
 
 LOCAL_MODULE_FILENAME := libcocosbuilder
 
-ifeq ($(USE_ARM_MODE),1)
 LOCAL_ARM_MODE := arm
-endif
 
 LOCAL_SRC_FILES := CCBAnimationManager.cpp \
 CCBFileLoader.cpp \
diff --git a/cocos/editor-support/cocostudio/Android.mk b/cocos/editor-support/cocostudio/Android.mk
index 720774bd7e..60c7985657 100644
--- a/cocos/editor-support/cocostudio/Android.mk
+++ b/cocos/editor-support/cocostudio/Android.mk
@@ -5,9 +5,7 @@ LOCAL_MODULE := cocostudio_static
 
 LOCAL_MODULE_FILENAME := libcocostudio
 
-ifeq ($(USE_ARM_MODE),1)
 LOCAL_ARM_MODE := arm
-endif
 
 LOCAL_SRC_FILES := CCActionFrame.cpp \
 CCActionFrameEasing.cpp \
diff --git a/cocos/editor-support/spine/Android.mk b/cocos/editor-support/spine/Android.mk
index f357b68771..12cb6af802 100644
--- a/cocos/editor-support/spine/Android.mk
+++ b/cocos/editor-support/spine/Android.mk
@@ -5,9 +5,7 @@ LOCAL_MODULE := spine_static
 
 LOCAL_MODULE_FILENAME := libspine
 
-ifeq ($(USE_ARM_MODE),1)
 LOCAL_ARM_MODE := arm
-endif
 
 LOCAL_SRC_FILES := Animation.c \
 AnimationState.c \
diff --git a/cocos/network/Android.mk b/cocos/network/Android.mk
index 7278fda31a..85b1a2a1b2 100644
--- a/cocos/network/Android.mk
+++ b/cocos/network/Android.mk
@@ -5,6 +5,8 @@ LOCAL_MODULE := cocos_network_static
 
 LOCAL_MODULE_FILENAME := libnetwork
 
+LOCAL_ARM_MODE := arm
+
 LOCAL_SRC_FILES := HttpClient-android.cpp \
 SocketIO.cpp \
 WebSocket.cpp \
diff --git a/cocos/scripting/js-bindings/proj.android/Android.mk b/cocos/scripting/js-bindings/proj.android/Android.mk
index 0a96378af4..fdf9ba0f4b 100644
--- a/cocos/scripting/js-bindings/proj.android/Android.mk
+++ b/cocos/scripting/js-bindings/proj.android/Android.mk
@@ -6,9 +6,7 @@ LOCAL_MODULE := cocos2d_js_android_static
 
 LOCAL_MODULE_FILENAME := libjscocos2dandroid
 
-ifeq ($(COCOS_SIMULATOR_BUILD),1)
 LOCAL_ARM_MODE := arm
-endif
 
 LOCAL_SRC_FILES := ../manual/platform/android/CCJavascriptJavaBridge.cpp
 
@@ -35,6 +33,8 @@ LOCAL_MODULE := cocos2d_js_static
 
 LOCAL_MODULE_FILENAME := libjscocos2d
 
+LOCAL_ARM_MODE := arm
+
 LOCAL_SRC_FILES := ../auto/jsb_cocos2dx_3d_auto.cpp \
                    ../auto/jsb_cocos2dx_extension_auto.cpp \
                    ../auto/jsb_cocos2dx_3d_extension_auto.cpp \
diff --git a/cocos/scripting/lua-bindings/proj.android/Android.mk b/cocos/scripting/lua-bindings/proj.android/Android.mk
index 6fb3ffac74..4a3f1390cd 100644
--- a/cocos/scripting/lua-bindings/proj.android/Android.mk
+++ b/cocos/scripting/lua-bindings/proj.android/Android.mk
@@ -6,6 +6,8 @@ LOCAL_MODULE := cocos2d_lua_android_static
 
 LOCAL_MODULE_FILENAME := libluacocos2dandroid
 
+LOCAL_ARM_MODE := arm
+
 LOCAL_SRC_FILES := ../manual/platform/android/CCLuaJavaBridge.cpp \
                    ../manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp
 
@@ -31,9 +33,7 @@ LOCAL_MODULE    := cocos2d_lua_static
 
 LOCAL_MODULE_FILENAME := libluacocos2d
 
-ifeq ($(COCOS_SIMULATOR_BUILD),1)
 LOCAL_ARM_MODE := arm
-endif
 
 LOCAL_SRC_FILES := ../manual/CCLuaBridge.cpp \
           ../manual/CCLuaEngine.cpp \
diff --git a/cocos/storage/local-storage/Android.mk b/cocos/storage/local-storage/Android.mk
index 1be88284e4..3888b4203b 100644
--- a/cocos/storage/local-storage/Android.mk
+++ b/cocos/storage/local-storage/Android.mk
@@ -5,6 +5,8 @@ LOCAL_MODULE := cocos_localstorage_static
 
 LOCAL_MODULE_FILENAME := liblocalstorage
 
+LOCAL_ARM_MODE := arm
+
 LOCAL_SRC_FILES := LocalStorage.cpp \
 LocalStorage-android.cpp 
 
diff --git a/cocos/ui/Android.mk b/cocos/ui/Android.mk
index aa5b4dbbe0..945d59d2fa 100644
--- a/cocos/ui/Android.mk
+++ b/cocos/ui/Android.mk
@@ -5,9 +5,7 @@ LOCAL_MODULE := cocos_ui_static
 
 LOCAL_MODULE_FILENAME := libui
 
-ifeq ($(USE_ARM_MODE),1)
 LOCAL_ARM_MODE := arm
-endif
 
 LOCAL_SRC_FILES := \
 UIWidget.cpp \
diff --git a/extensions/Android.mk b/extensions/Android.mk
index 0b07cc7709..f930fd094b 100644
--- a/extensions/Android.mk
+++ b/extensions/Android.mk
@@ -5,9 +5,7 @@ LOCAL_MODULE    := cocos_extension_static
 
 LOCAL_MODULE_FILENAME := libextension
 
-ifeq ($(USE_ARM_MODE),1)
 LOCAL_ARM_MODE := arm
-endif
 
 LOCAL_SRC_FILES := \
 assets-manager/AssetsManager.cpp \
diff --git a/external/config.json b/external/config.json
index 697d079267..65ac538da3 100644
--- a/external/config.json
+++ b/external/config.json
@@ -1,5 +1,5 @@
 {
-    "version":"v3-deps-100",
+    "version":"v3-deps-101",
     "zip_file_size":"128440074",
     "repo_name":"cocos2d-x-3rd-party-libs-bin",
     "repo_parent":"https://github.com/cocos2d/",
diff --git a/tests/cpp-empty-test/proj.android-studio/app/jni/Android.mk b/tests/cpp-empty-test/proj.android-studio/app/jni/Android.mk
index c4966a4251..f390e10336 100644
--- a/tests/cpp-empty-test/proj.android-studio/app/jni/Android.mk
+++ b/tests/cpp-empty-test/proj.android-studio/app/jni/Android.mk
@@ -6,6 +6,8 @@ LOCAL_MODULE := cpp_empty_test_shared
 
 LOCAL_MODULE_FILENAME := libcpp_empty_test
 
+LOCAL_ARM_MODE := arm
+
 LOCAL_SRC_FILES := main.cpp \
                    ../../../Classes/AppDelegate.cpp \
                    ../../../Classes/HelloWorldScene.cpp
diff --git a/tests/cpp-empty-test/proj.android-studio/app/jni/Application.mk b/tests/cpp-empty-test/proj.android-studio/app/jni/Application.mk
index 07aa592b13..760bf75982 100644
--- a/tests/cpp-empty-test/proj.android-studio/app/jni/Application.mk
+++ b/tests/cpp-empty-test/proj.android-studio/app/jni/Application.mk
@@ -2,7 +2,7 @@ APP_STL := gnustl_static
 
 APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
 APP_LDFLAGS := -latomic
-
+APP_ABI := armeabi
 
 ifeq ($(NDK_DEBUG),1)
   APP_CPPFLAGS += -DCOCOS2D_DEBUG=1
diff --git a/tests/cpp-empty-test/proj.android/jni/Android.mk b/tests/cpp-empty-test/proj.android/jni/Android.mk
index b351c80aa6..4c6ded56a5 100644
--- a/tests/cpp-empty-test/proj.android/jni/Android.mk
+++ b/tests/cpp-empty-test/proj.android/jni/Android.mk
@@ -6,6 +6,8 @@ LOCAL_MODULE := cpp_empty_test_shared
 
 LOCAL_MODULE_FILENAME := libcpp_empty_test
 
+LOCAL_ARM_MODE := arm
+
 LOCAL_SRC_FILES := main.cpp \
                    ../../Classes/AppDelegate.cpp \
                    ../../Classes/HelloWorldScene.cpp
diff --git a/tests/cpp-empty-test/proj.android/jni/Application.mk b/tests/cpp-empty-test/proj.android/jni/Application.mk
index 07aa592b13..231945156f 100644
--- a/tests/cpp-empty-test/proj.android/jni/Application.mk
+++ b/tests/cpp-empty-test/proj.android/jni/Application.mk
@@ -2,6 +2,7 @@ APP_STL := gnustl_static
 
 APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
 APP_LDFLAGS := -latomic
+APP_ABI := armeabi
 
 
 ifeq ($(NDK_DEBUG),1)
diff --git a/tests/cpp-tests/proj.android-studio/app/jni/Android.mk b/tests/cpp-tests/proj.android-studio/app/jni/Android.mk
index 2f885d393b..4ef5806d56 100644
--- a/tests/cpp-tests/proj.android-studio/app/jni/Android.mk
+++ b/tests/cpp-tests/proj.android-studio/app/jni/Android.mk
@@ -6,6 +6,8 @@ LOCAL_MODULE := cpp_tests_shared
 
 LOCAL_MODULE_FILENAME := libcpp_tests
 
+LOCAL_ARM_MODE := arm
+
 LOCAL_SRC_FILES := main.cpp \
 ../../../Classes/ActionManagerTest/ActionManagerTest.cpp \
 ../../../Classes/ActionsEaseTest/ActionsEaseTest.cpp \
diff --git a/tests/cpp-tests/proj.android-studio/app/jni/Application.mk b/tests/cpp-tests/proj.android-studio/app/jni/Application.mk
index f80e3bad04..a6bf3f4c29 100644
--- a/tests/cpp-tests/proj.android-studio/app/jni/Application.mk
+++ b/tests/cpp-tests/proj.android-studio/app/jni/Application.mk
@@ -3,6 +3,8 @@ APP_STL := gnustl_static
 APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
 APP_LDFLAGS := -latomic
 
+APP_ABI := armeabi
+
 ifeq ($(NDK_DEBUG),1)
   APP_CPPFLAGS += -DCOCOS2D_DEBUG=1
   APP_OPTIM := debug
diff --git a/tests/cpp-tests/proj.android/jni/Android.mk b/tests/cpp-tests/proj.android/jni/Android.mk
index 7285c8304d..3a75043ddd 100644
--- a/tests/cpp-tests/proj.android/jni/Android.mk
+++ b/tests/cpp-tests/proj.android/jni/Android.mk
@@ -6,6 +6,8 @@ LOCAL_MODULE := cpp_tests_shared
 
 LOCAL_MODULE_FILENAME := libcpp_tests
 
+LOCAL_ARM_MODE := arm
+
 LOCAL_SRC_FILES := main.cpp \
 ../../Classes/ActionManagerTest/ActionManagerTest.cpp \
 ../../Classes/ActionsEaseTest/ActionsEaseTest.cpp \
diff --git a/tests/cpp-tests/proj.android/jni/Application.mk b/tests/cpp-tests/proj.android/jni/Application.mk
index f80e3bad04..a6bf3f4c29 100644
--- a/tests/cpp-tests/proj.android/jni/Application.mk
+++ b/tests/cpp-tests/proj.android/jni/Application.mk
@@ -3,6 +3,8 @@ APP_STL := gnustl_static
 APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
 APP_LDFLAGS := -latomic
 
+APP_ABI := armeabi
+
 ifeq ($(NDK_DEBUG),1)
   APP_CPPFLAGS += -DCOCOS2D_DEBUG=1
   APP_OPTIM := debug
diff --git a/tests/game-controller-test/proj.android-studio/app/jni/Android.mk b/tests/game-controller-test/proj.android-studio/app/jni/Android.mk
index a6f4c33c22..8248b7117c 100644
--- a/tests/game-controller-test/proj.android-studio/app/jni/Android.mk
+++ b/tests/game-controller-test/proj.android-studio/app/jni/Android.mk
@@ -6,6 +6,8 @@ LOCAL_MODULE := game_controller_test_shared
 
 LOCAL_MODULE_FILENAME := libgame_controller_test
 
+LOCAL_ARM_MODE := arm
+
 LOCAL_SRC_FILES := main.cpp \
                    ../../../Classes/AppDelegate.cpp \
                    ../../../Classes/GameControllerTest.cpp
diff --git a/tests/game-controller-test/proj.android-studio/app/jni/Application.mk b/tests/game-controller-test/proj.android-studio/app/jni/Application.mk
index 07aa592b13..760bf75982 100644
--- a/tests/game-controller-test/proj.android-studio/app/jni/Application.mk
+++ b/tests/game-controller-test/proj.android-studio/app/jni/Application.mk
@@ -2,7 +2,7 @@ APP_STL := gnustl_static
 
 APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
 APP_LDFLAGS := -latomic
-
+APP_ABI := armeabi
 
 ifeq ($(NDK_DEBUG),1)
   APP_CPPFLAGS += -DCOCOS2D_DEBUG=1
diff --git a/tests/game-controller-test/proj.android/jni/Android.mk b/tests/game-controller-test/proj.android/jni/Android.mk
index dadc927957..2be9ed4982 100644
--- a/tests/game-controller-test/proj.android/jni/Android.mk
+++ b/tests/game-controller-test/proj.android/jni/Android.mk
@@ -6,6 +6,8 @@ LOCAL_MODULE := game_controller_test_shared
 
 LOCAL_MODULE_FILENAME := libgame_controller_test
 
+LOCAL_ARM_MODE := arm
+
 LOCAL_SRC_FILES := main.cpp \
                    ../../Classes/AppDelegate.cpp \
                    ../../Classes/GameControllerTest.cpp
diff --git a/tests/game-controller-test/proj.android/jni/Application.mk b/tests/game-controller-test/proj.android/jni/Application.mk
index 07aa592b13..760bf75982 100644
--- a/tests/game-controller-test/proj.android/jni/Application.mk
+++ b/tests/game-controller-test/proj.android/jni/Application.mk
@@ -2,7 +2,7 @@ APP_STL := gnustl_static
 
 APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
 APP_LDFLAGS := -latomic
-
+APP_ABI := armeabi
 
 ifeq ($(NDK_DEBUG),1)
   APP_CPPFLAGS += -DCOCOS2D_DEBUG=1
diff --git a/tests/js-memory-gc-tests/project/proj.android-studio/app/jni/Android.mk b/tests/js-memory-gc-tests/project/proj.android-studio/app/jni/Android.mk
index dab475af1c..7004beea53 100644
--- a/tests/js-memory-gc-tests/project/proj.android-studio/app/jni/Android.mk
+++ b/tests/js-memory-gc-tests/project/proj.android-studio/app/jni/Android.mk
@@ -6,6 +6,8 @@ LOCAL_MODULE := js_tests_shared
 
 LOCAL_MODULE_FILENAME := libjs_tests
 
+LOCAL_ARM_MODE := arm
+
 LOCAL_SRC_FILES := main.cpp \
                    ../../../Classes/AppDelegate.cpp \
                    ../../../Classes/js_DrawNode3D_bindings.cpp \
diff --git a/tests/js-memory-gc-tests/project/proj.android-studio/app/jni/Application.mk b/tests/js-memory-gc-tests/project/proj.android-studio/app/jni/Application.mk
index 81ca21b08f..a49b14ad8e 100644
--- a/tests/js-memory-gc-tests/project/proj.android-studio/app/jni/Application.mk
+++ b/tests/js-memory-gc-tests/project/proj.android-studio/app/jni/Application.mk
@@ -5,8 +5,7 @@ APP_STL := gnustl_static
 
 APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
 APP_LDFLAGS := -latomic
-
-USE_ARM_MODE := 1
+APP_ABI := armeabi
 
 ifeq ($(NDK_DEBUG),1)
   APP_CPPFLAGS += -DCOCOS2D_DEBUG=1
diff --git a/tests/js-memory-gc-tests/project/proj.android/jni/Android.mk b/tests/js-memory-gc-tests/project/proj.android/jni/Android.mk
index 4ea163a5bb..ce2c9f930b 100644
--- a/tests/js-memory-gc-tests/project/proj.android/jni/Android.mk
+++ b/tests/js-memory-gc-tests/project/proj.android/jni/Android.mk
@@ -6,6 +6,8 @@ LOCAL_MODULE := js_tests_shared
 
 LOCAL_MODULE_FILENAME := libjs_tests
 
+LOCAL_ARM_MODE := arm
+
 LOCAL_SRC_FILES := main.cpp \
                    ../../Classes/AppDelegate.cpp \
                    ../../Classes/js_DrawNode3D_bindings.cpp \
diff --git a/tests/js-memory-gc-tests/project/proj.android/jni/Application.mk b/tests/js-memory-gc-tests/project/proj.android/jni/Application.mk
index 81ca21b08f..a49b14ad8e 100644
--- a/tests/js-memory-gc-tests/project/proj.android/jni/Application.mk
+++ b/tests/js-memory-gc-tests/project/proj.android/jni/Application.mk
@@ -5,8 +5,7 @@ APP_STL := gnustl_static
 
 APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
 APP_LDFLAGS := -latomic
-
-USE_ARM_MODE := 1
+APP_ABI := armeabi
 
 ifeq ($(NDK_DEBUG),1)
   APP_CPPFLAGS += -DCOCOS2D_DEBUG=1
diff --git a/tests/js-tests/project/proj.android-studio/app/jni/Android.mk b/tests/js-tests/project/proj.android-studio/app/jni/Android.mk
index dab475af1c..7004beea53 100644
--- a/tests/js-tests/project/proj.android-studio/app/jni/Android.mk
+++ b/tests/js-tests/project/proj.android-studio/app/jni/Android.mk
@@ -6,6 +6,8 @@ LOCAL_MODULE := js_tests_shared
 
 LOCAL_MODULE_FILENAME := libjs_tests
 
+LOCAL_ARM_MODE := arm
+
 LOCAL_SRC_FILES := main.cpp \
                    ../../../Classes/AppDelegate.cpp \
                    ../../../Classes/js_DrawNode3D_bindings.cpp \
diff --git a/tests/js-tests/project/proj.android-studio/app/jni/Application.mk b/tests/js-tests/project/proj.android-studio/app/jni/Application.mk
index 81ca21b08f..a49b14ad8e 100644
--- a/tests/js-tests/project/proj.android-studio/app/jni/Application.mk
+++ b/tests/js-tests/project/proj.android-studio/app/jni/Application.mk
@@ -5,8 +5,7 @@ APP_STL := gnustl_static
 
 APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
 APP_LDFLAGS := -latomic
-
-USE_ARM_MODE := 1
+APP_ABI := armeabi
 
 ifeq ($(NDK_DEBUG),1)
   APP_CPPFLAGS += -DCOCOS2D_DEBUG=1
diff --git a/tests/js-tests/project/proj.android/jni/Android.mk b/tests/js-tests/project/proj.android/jni/Android.mk
index 4ea163a5bb..ce2c9f930b 100644
--- a/tests/js-tests/project/proj.android/jni/Android.mk
+++ b/tests/js-tests/project/proj.android/jni/Android.mk
@@ -6,6 +6,8 @@ LOCAL_MODULE := js_tests_shared
 
 LOCAL_MODULE_FILENAME := libjs_tests
 
+LOCAL_ARM_MODE := arm
+
 LOCAL_SRC_FILES := main.cpp \
                    ../../Classes/AppDelegate.cpp \
                    ../../Classes/js_DrawNode3D_bindings.cpp \
diff --git a/tests/js-tests/project/proj.android/jni/Application.mk b/tests/js-tests/project/proj.android/jni/Application.mk
index 81ca21b08f..a49b14ad8e 100644
--- a/tests/js-tests/project/proj.android/jni/Application.mk
+++ b/tests/js-tests/project/proj.android/jni/Application.mk
@@ -5,8 +5,7 @@ APP_STL := gnustl_static
 
 APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
 APP_LDFLAGS := -latomic
-
-USE_ARM_MODE := 1
+APP_ABI := armeabi
 
 ifeq ($(NDK_DEBUG),1)
   APP_CPPFLAGS += -DCOCOS2D_DEBUG=1
diff --git a/tests/lua-empty-test/project/proj.android-studio/app/jni/Android.mk b/tests/lua-empty-test/project/proj.android-studio/app/jni/Android.mk
index 759fefdd0b..0bde9c629c 100644
--- a/tests/lua-empty-test/project/proj.android-studio/app/jni/Android.mk
+++ b/tests/lua-empty-test/project/proj.android-studio/app/jni/Android.mk
@@ -6,6 +6,8 @@ LOCAL_MODULE := lua_empty_test_shared
 
 LOCAL_MODULE_FILENAME := liblua_empty_test
 
+LOCAL_ARM_MODE := arm
+
 LOCAL_SRC_FILES := main.cpp \
                    ../../../Classes/AppDelegate.cpp
 
diff --git a/tests/lua-empty-test/project/proj.android-studio/app/jni/Application.mk b/tests/lua-empty-test/project/proj.android-studio/app/jni/Application.mk
index 07aa592b13..231945156f 100644
--- a/tests/lua-empty-test/project/proj.android-studio/app/jni/Application.mk
+++ b/tests/lua-empty-test/project/proj.android-studio/app/jni/Application.mk
@@ -2,6 +2,7 @@ APP_STL := gnustl_static
 
 APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
 APP_LDFLAGS := -latomic
+APP_ABI := armeabi
 
 
 ifeq ($(NDK_DEBUG),1)
diff --git a/tests/lua-empty-test/project/proj.android/jni/Android.mk b/tests/lua-empty-test/project/proj.android/jni/Android.mk
index f17206a675..73e716fc57 100644
--- a/tests/lua-empty-test/project/proj.android/jni/Android.mk
+++ b/tests/lua-empty-test/project/proj.android/jni/Android.mk
@@ -6,6 +6,8 @@ LOCAL_MODULE := lua_empty_test_shared
 
 LOCAL_MODULE_FILENAME := liblua_empty_test
 
+LOCAL_ARM_MODE := arm
+
 LOCAL_SRC_FILES := main.cpp \
                    ../../Classes/AppDelegate.cpp
 
diff --git a/tests/lua-empty-test/project/proj.android/jni/Application.mk b/tests/lua-empty-test/project/proj.android/jni/Application.mk
index 07aa592b13..231945156f 100644
--- a/tests/lua-empty-test/project/proj.android/jni/Application.mk
+++ b/tests/lua-empty-test/project/proj.android/jni/Application.mk
@@ -2,6 +2,7 @@ APP_STL := gnustl_static
 
 APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
 APP_LDFLAGS := -latomic
+APP_ABI := armeabi
 
 
 ifeq ($(NDK_DEBUG),1)
diff --git a/tests/lua-game-controller-test/project/proj.android-studio/app/jni/Android.mk b/tests/lua-game-controller-test/project/proj.android-studio/app/jni/Android.mk
index 5736173d0b..0012dfb0d7 100644
--- a/tests/lua-game-controller-test/project/proj.android-studio/app/jni/Android.mk
+++ b/tests/lua-game-controller-test/project/proj.android-studio/app/jni/Android.mk
@@ -6,6 +6,8 @@ LOCAL_MODULE := lua_game_controller_test_shared
 
 LOCAL_MODULE_FILENAME := liblua_game_controller
 
+LOCAL_ARM_MODE := arm
+
 LOCAL_SRC_FILES := main.cpp \
                    ../../../Classes/AppDelegate.cpp \
                    ../../../../../../cocos/scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.cpp \
diff --git a/tests/lua-game-controller-test/project/proj.android-studio/app/jni/Application.mk b/tests/lua-game-controller-test/project/proj.android-studio/app/jni/Application.mk
index 07aa592b13..231945156f 100644
--- a/tests/lua-game-controller-test/project/proj.android-studio/app/jni/Application.mk
+++ b/tests/lua-game-controller-test/project/proj.android-studio/app/jni/Application.mk
@@ -2,6 +2,7 @@ APP_STL := gnustl_static
 
 APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
 APP_LDFLAGS := -latomic
+APP_ABI := armeabi
 
 
 ifeq ($(NDK_DEBUG),1)
diff --git a/tests/lua-game-controller-test/project/proj.android/jni/Android.mk b/tests/lua-game-controller-test/project/proj.android/jni/Android.mk
index 80efdda538..4e4e74257f 100644
--- a/tests/lua-game-controller-test/project/proj.android/jni/Android.mk
+++ b/tests/lua-game-controller-test/project/proj.android/jni/Android.mk
@@ -6,6 +6,8 @@ LOCAL_MODULE := lua_game_controller_test_shared
 
 LOCAL_MODULE_FILENAME := liblua_game_controller
 
+LOCAL_ARM_MODE := arm
+
 LOCAL_SRC_FILES := main.cpp \
                    ../../Classes/AppDelegate.cpp \
                    ../../../../../cocos/scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.cpp \
diff --git a/tests/lua-game-controller-test/project/proj.android/jni/Application.mk b/tests/lua-game-controller-test/project/proj.android/jni/Application.mk
index 07aa592b13..760bf75982 100644
--- a/tests/lua-game-controller-test/project/proj.android/jni/Application.mk
+++ b/tests/lua-game-controller-test/project/proj.android/jni/Application.mk
@@ -2,7 +2,7 @@ APP_STL := gnustl_static
 
 APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
 APP_LDFLAGS := -latomic
-
+APP_ABI := armeabi
 
 ifeq ($(NDK_DEBUG),1)
   APP_CPPFLAGS += -DCOCOS2D_DEBUG=1
diff --git a/tests/lua-tests/project/proj.android-studio/app/jni/Android.mk b/tests/lua-tests/project/proj.android-studio/app/jni/Android.mk
index 9b29c5b7c6..e876292b10 100644
--- a/tests/lua-tests/project/proj.android-studio/app/jni/Android.mk
+++ b/tests/lua-tests/project/proj.android-studio/app/jni/Android.mk
@@ -6,6 +6,8 @@ LOCAL_MODULE := lua_tests_shared
 
 LOCAL_MODULE_FILENAME := liblua_tests
 
+LOCAL_ARM_MODE := arm
+
 LOCAL_SRC_FILES += main.cpp \
                    ../../../Classes/AppDelegate.cpp \
                    ../../../Classes/lua_assetsmanager_test_sample.cpp \
diff --git a/tests/lua-tests/project/proj.android-studio/app/jni/Application.mk b/tests/lua-tests/project/proj.android-studio/app/jni/Application.mk
index 07aa592b13..760bf75982 100644
--- a/tests/lua-tests/project/proj.android-studio/app/jni/Application.mk
+++ b/tests/lua-tests/project/proj.android-studio/app/jni/Application.mk
@@ -2,7 +2,7 @@ APP_STL := gnustl_static
 
 APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
 APP_LDFLAGS := -latomic
-
+APP_ABI := armeabi
 
 ifeq ($(NDK_DEBUG),1)
   APP_CPPFLAGS += -DCOCOS2D_DEBUG=1
diff --git a/tests/lua-tests/project/proj.android/jni/Android.mk b/tests/lua-tests/project/proj.android/jni/Android.mk
index 2776ac7475..bd18cb38cc 100644
--- a/tests/lua-tests/project/proj.android/jni/Android.mk
+++ b/tests/lua-tests/project/proj.android/jni/Android.mk
@@ -6,6 +6,8 @@ LOCAL_MODULE := lua_tests_shared
 
 LOCAL_MODULE_FILENAME := liblua_tests
 
+LOCAL_ARM_MODE := arm
+
 LOCAL_SRC_FILES += main.cpp \
                    ../../Classes/AppDelegate.cpp \
                    ../../Classes/lua_assetsmanager_test_sample.cpp \
diff --git a/tests/lua-tests/project/proj.android/jni/Application.mk b/tests/lua-tests/project/proj.android/jni/Application.mk
index 07aa592b13..760bf75982 100644
--- a/tests/lua-tests/project/proj.android/jni/Application.mk
+++ b/tests/lua-tests/project/proj.android/jni/Application.mk
@@ -2,7 +2,7 @@ APP_STL := gnustl_static
 
 APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
 APP_LDFLAGS := -latomic
-
+APP_ABI := armeabi
 
 ifeq ($(NDK_DEBUG),1)
   APP_CPPFLAGS += -DCOCOS2D_DEBUG=1
diff --git a/tests/performance-tests/proj.android-studio/app/jni/Android.mk b/tests/performance-tests/proj.android-studio/app/jni/Android.mk
index 87b657d1c0..6dc7e37679 100644
--- a/tests/performance-tests/proj.android-studio/app/jni/Android.mk
+++ b/tests/performance-tests/proj.android-studio/app/jni/Android.mk
@@ -6,6 +6,8 @@ LOCAL_MODULE := cocos2dcpp_shared
 
 LOCAL_MODULE_FILENAME := libcocos2dcpp
 
+LOCAL_ARM_MODE := arm
+
 LOCAL_SRC_FILES := hellocpp/main.cpp \
                    ../../../Classes/AppDelegate.cpp \
                    ../../../Classes/Profile.cpp \
diff --git a/tests/performance-tests/proj.android-studio/app/jni/Application.mk b/tests/performance-tests/proj.android-studio/app/jni/Application.mk
index 07aa592b13..760bf75982 100644
--- a/tests/performance-tests/proj.android-studio/app/jni/Application.mk
+++ b/tests/performance-tests/proj.android-studio/app/jni/Application.mk
@@ -2,7 +2,7 @@ APP_STL := gnustl_static
 
 APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
 APP_LDFLAGS := -latomic
-
+APP_ABI := armeabi
 
 ifeq ($(NDK_DEBUG),1)
   APP_CPPFLAGS += -DCOCOS2D_DEBUG=1
diff --git a/tests/performance-tests/proj.android/jni/Android.mk b/tests/performance-tests/proj.android/jni/Android.mk
index 1635a48031..9ca9e248df 100644
--- a/tests/performance-tests/proj.android/jni/Android.mk
+++ b/tests/performance-tests/proj.android/jni/Android.mk
@@ -6,6 +6,8 @@ LOCAL_MODULE := cocos2dcpp_shared
 
 LOCAL_MODULE_FILENAME := libcocos2dcpp
 
+LOCAL_ARM_MODE := arm
+
 LOCAL_SRC_FILES := hellocpp/main.cpp \
                    ../../Classes/AppDelegate.cpp \
                    ../../Classes/Profile.cpp \
diff --git a/tests/performance-tests/proj.android/jni/Application.mk b/tests/performance-tests/proj.android/jni/Application.mk
index 07aa592b13..760bf75982 100644
--- a/tests/performance-tests/proj.android/jni/Application.mk
+++ b/tests/performance-tests/proj.android/jni/Application.mk
@@ -2,7 +2,7 @@ APP_STL := gnustl_static
 
 APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
 APP_LDFLAGS := -latomic
-
+APP_ABI := armeabi
 
 ifeq ($(NDK_DEBUG),1)
   APP_CPPFLAGS += -DCOCOS2D_DEBUG=1
diff --git a/tools/simulator/frameworks/runtime-src/proj.android/jni/Android.mk b/tools/simulator/frameworks/runtime-src/proj.android/jni/Android.mk
index dd8fbcadba..c1982e664f 100644
--- a/tools/simulator/frameworks/runtime-src/proj.android/jni/Android.mk
+++ b/tools/simulator/frameworks/runtime-src/proj.android/jni/Android.mk
@@ -6,9 +6,7 @@ LOCAL_MODULE := cocos2dlua_shared
 
 LOCAL_MODULE_FILENAME := libcocos2dlua
 
-ifeq ($(COCOS_SIMULATOR_BUILD),1)
 LOCAL_ARM_MODE := arm
-endif
 
 FILE_LIST := hellolua/main.cpp
 FILE_LIST += $(wildcard $(LOCAL_PATH)/../../Classes/*.cpp)
diff --git a/tools/simulator/libsimulator/proj.android/Android.mk b/tools/simulator/libsimulator/proj.android/Android.mk
index f67ea9aa36..42ce11df89 100644
--- a/tools/simulator/libsimulator/proj.android/Android.mk
+++ b/tools/simulator/libsimulator/proj.android/Android.mk
@@ -5,6 +5,8 @@ LOCAL_MODULE := cocos2d_simulator_static
 
 LOCAL_MODULE_FILENAME := libsimulator
 
+LOCAL_ARM_MODE := arm
+
 LOCAL_SRC_FILES := \
 ../lib/protobuf-lite/google/protobuf/io/coded_stream.cc \
 ../lib/protobuf-lite/google/protobuf/stubs/common.cc \