Updates Android.mk.

Author: James Chen

jsb/bindings/Android.mk

@@ -39,6 +39,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static
 
 include $(BUILD_STATIC_LIBRARY)
 
-$(call import-module,spidermonkey/prebuilt/android)
+$(call import-module,external/spidermonkey/prebuilt/android)
 $(call import-module,2d)
 $(call import-module,audio/android)

jsb/bindings/manual/chipmunk/Android.mk

@@ -26,7 +26,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES += chipmunk_static
 
 include $(BUILD_STATIC_LIBRARY)
 
-$(call import-module,spidermonkey/prebuilt/android)
+$(call import-module,external/spidermonkey/prebuilt/android)
 $(call import-module,bindings)
 $(call import-module,extensions)
 $(call import-module,chipmunk)

jsb/bindings/manual/cocosbuilder/Android.mk

@@ -24,6 +24,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES += cocosbuilder_static
 
 include $(BUILD_STATIC_LIBRARY)
 
-$(call import-module,spidermonkey/prebuilt/android)
+$(call import-module,external/spidermonkey/prebuilt/android)
 $(call import-module,bindings)
 $(call import-module,editor-support/cocosbuilder)

jsb/bindings/manual/cocostudio/Android.mk

@@ -25,6 +25,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES += cocostudio_static
 
 include $(BUILD_STATIC_LIBRARY)
 
-$(call import-module,spidermonkey/prebuilt/android)
+$(call import-module,external/spidermonkey/prebuilt/android)
 $(call import-module,bindings)
 $(call import-module,editor-support/cocostudio)

jsb/bindings/manual/extension/Android.mk

@@ -25,6 +25,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES += cocos_extension_static
 
 include $(BUILD_STATIC_LIBRARY)
 
-$(call import-module,spidermonkey/prebuilt/android)
+$(call import-module,external/spidermonkey/prebuilt/android)
 $(call import-module,bindings)
 $(call import-module,extensions)

jsb/bindings/manual/gui/Android.mk

@@ -25,6 +25,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES += cocos_gui_static
 
 include $(BUILD_STATIC_LIBRARY)
 
-$(call import-module,spidermonkey/prebuilt/android)
+$(call import-module,external/spidermonkey/prebuilt/android)
 $(call import-module,bindings)
 $(call import-module,gui)

jsb/bindings/manual/localstorage/Android.mk

@@ -24,6 +24,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES += cocos_localstorage_static
 
 include $(BUILD_STATIC_LIBRARY)
 
-$(call import-module,spidermonkey/prebuilt/android)
+$(call import-module,external/spidermonkey/prebuilt/android)
 $(call import-module,bindings)
 $(call import-module,storage/local-storage)

jsb/bindings/manual/network/Android.mk

@@ -24,7 +24,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES += websockets_static
 
 include $(BUILD_STATIC_LIBRARY)
 
-$(call import-module,spidermonkey/prebuilt/android)
+$(call import-module,external/spidermonkey/prebuilt/android)
 $(call import-module,bindings)
 $(call import-module,network)
 $(call import-module,websockets/prebuilt/android)

jsb/bindings/manual/spine/Android.mk

@@ -25,6 +25,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES += spine_static
 
 include $(BUILD_STATIC_LIBRARY)
 
-$(call import-module,spidermonkey/prebuilt/android)
+$(call import-module,external/spidermonkey/prebuilt/android)
 $(call import-module,bindings)
 $(call import-module,editor-support/spine)

jsb/build/android-build.py

@@ -154,7 +154,7 @@ def build_samples(ndk_build_param,android_platform,build_mode):
     elif build_mode != 'release':
         build_mode = 'debug'
 
-    app_android_root = os.path.join(cocos_root, '../project/proj.android')       
+    app_android_root = os.path.join(cocos_root, '../tests-project/proj.android')       
     copy_resources(os.path.join(cocos_root, app_android_root))
     do_build(cocos_root, ndk_root, app_android_root, ndk_build_param,sdk_root,android_platform,build_mode)