Adjust the dependencies between modules on android.

cocos/Android.mk

@@ -206,12 +206,6 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) \
                     $(LOCAL_PATH)/../external/ConvertUTF \
                     $(LOCAL_PATH)/../external/nslog
 
-
-LOCAL_LDLIBS := -lGLESv2 \
-                -llog \
-                -lz \
-                -landroid
-
 LOCAL_EXPORT_LDLIBS := -lGLESv2 \
                        -llog \
                        -lz \
@@ -220,6 +214,10 @@ LOCAL_EXPORT_LDLIBS := -lGLESv2 \
 LOCAL_WHOLE_STATIC_LIBRARIES := cocos_freetype2_static
 LOCAL_WHOLE_STATIC_LIBRARIES += chipmunk_static
 LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dxandroid_static
+LOCAL_WHOLE_STATIC_LIBRARIES += cocos_png_static
+LOCAL_WHOLE_STATIC_LIBRARIES += cocos_jpeg_static
+LOCAL_WHOLE_STATIC_LIBRARIES += cocos_tiff_static
+LOCAL_WHOLE_STATIC_LIBRARIES += cocos_webp_static
 
 # define the macro to compile through support/zip_support/ioapi.c
 LOCAL_CFLAGS   :=  -DUSE_FILE32API
@@ -232,3 +230,7 @@ include $(BUILD_STATIC_LIBRARY)
 $(call import-module,freetype2/prebuilt/android)
 $(call import-module,chipmunk)
 $(call import-module,platform/android)
+$(call import-module,jpeg/prebuilt/android)
+$(call import-module,png/prebuilt/android)
+$(call import-module,tiff/prebuilt/android)
+$(call import-module,webp/prebuilt/android)

cocos/editor-support/cocosbuilder/Android.mk

@@ -37,7 +37,9 @@ $(LOCAL_PATH)/../../..
 
 
 LOCAL_WHOLE_STATIC_LIBRARIES := cocos_extension_static
+LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dx_static
 
 include $(BUILD_STATIC_LIBRARY)
 
 $(call import-module,extensions)
+$(call import-module,.)

cocos/editor-support/cocostudio/Android.mk

@@ -72,12 +72,9 @@ LOCAL_CFLAGS += -fexceptions
 
 
 LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static
-LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static
 LOCAL_WHOLE_STATIC_LIBRARIES += cocos_ui_static
 
 include $(BUILD_STATIC_LIBRARY)
 
 $(call import-module,.)
-$(call import-module,audio/android)
 $(call import-module,ui)
-

cocos/platform/android/Android.mk

@@ -28,13 +28,6 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) \
                     $(LOCAL_PATH)/.. \
                     $(LOCAL_PATH)/../.. \
 
-LOCAL_LDLIBS := -lGLESv1_CM \
-                -lGLESv2 \
-                -lEGL \
-                -llog \
-                -lz \
-                -landroid
-
 LOCAL_EXPORT_LDLIBS := -lGLESv1_CM \
                        -lGLESv2 \
                        -lEGL \
@@ -42,12 +35,4 @@ LOCAL_EXPORT_LDLIBS := -lGLESv1_CM \
                        -lz \
                        -landroid
 
-LOCAL_WHOLE_STATIC_LIBRARIES	:= cocos_png_static cocos_jpeg_static cocos_tiff_static cocos_webp_static
-
-
 include $(BUILD_STATIC_LIBRARY)
-
-$(call import-module,jpeg/prebuilt/android)
-$(call import-module,png/prebuilt/android)
-$(call import-module,tiff/prebuilt/android)
-$(call import-module,webp/prebuilt/android)

extensions/Android.mk

@@ -30,11 +30,7 @@ physics-nodes/CCPhysicsDebugNode.cpp \
 physics-nodes/CCPhysicsSprite.cpp
 
 LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static
-LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static
 LOCAL_WHOLE_STATIC_LIBRARIES += cocos_curl_static
-LOCAL_WHOLE_STATIC_LIBRARIES += box2d_static
-LOCAL_WHOLE_STATIC_LIBRARIES += libwebsockets_static
-
 LOCAL_CXXFLAGS += -fexceptions
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
@@ -46,8 +42,4 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. \
 include $(BUILD_STATIC_LIBRARY)
 
 $(call import-module,.)
-$(call import-module,audio/android)
 $(call import-module,curl/prebuilt/android)
-$(call import-module,Box2D)
-$(call import-module,websockets/prebuilt/android)
-

tests/cpp-tests/Android.mk

@@ -186,19 +186,21 @@ Classes/ZwoptexTest/ZwoptexTest.cpp
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/Classes
 
 LOCAL_WHOLE_STATIC_LIBRARIES := cocosbuilder_static
+LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static
 LOCAL_WHOLE_STATIC_LIBRARIES += spine_static
 LOCAL_WHOLE_STATIC_LIBRARIES += cocostudio_static
 LOCAL_WHOLE_STATIC_LIBRARIES += cocos_network_static
 LOCAL_WHOLE_STATIC_LIBRARIES += cocos_extension_static
-
+LOCAL_WHOLE_STATIC_LIBRARIES += box2d_static
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/Classes
-            
+
 include $(BUILD_STATIC_LIBRARY)
 
 $(call import-module,extensions)
+$(call import-module,audio/android)
 $(call import-module,editor-support/cocosbuilder)
 $(call import-module,editor-support/spine)
 $(call import-module,editor-support/cocostudio)
 $(call import-module,network)
-$(call import-module,.)
+$(call import-module,Box2D)