diff --git a/cocos2dx/Android.mk b/cocos2dx/Android.mk index 4d66db1dd1..d97584fa03 100644 --- a/cocos2dx/Android.mk +++ b/cocos2dx/Android.mk @@ -1,8 +1,10 @@ LOCAL_PATH := $(call my-dir) -# compile cocos2d.so include $(CLEAR_VARS) -LOCAL_MODULE := libcocos2d + +LOCAL_MODULE := cocos2dx_shared + +LOCAL_MODULE_FILENAME := libcocos2d LOCAL_SRC_FILES := \ CCConfiguration.cpp \ @@ -93,7 +95,7 @@ text_input_node/CCIMEDispatcher.cpp \ text_input_node/CCTextFieldTTF.cpp \ textures/CCTexture2D.cpp \ textures/CCTextureAtlas.cpp \ -textures/CCTextureCache.cpp \ +textures/CCTextureCache.cpp \ textures/CCTexturePVR.cpp \ tileMap_parallax_nodes/CCParallaxNode.cpp \ tileMap_parallax_nodes/CCTMXLayer.cpp \ @@ -104,21 +106,30 @@ tileMap_parallax_nodes/CCTileMapAtlas.cpp \ touch_dispatcher/CCTouchDispatcher.cpp \ touch_dispatcher/CCTouchHandler.cpp +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/ \ + $(LOCAL_PATH)/include \ + $(LOCAL_PATH)/platform + LOCAL_C_INCLUDES := $(LOCAL_PATH)/ \ $(LOCAL_PATH)/include \ - $(LOCAL_PATH)/platform \ - $(LOCAL_PATH)/platform/third_party/android/iconv \ - $(LOCAL_PATH)/platform/third_party/android/libpng \ - $(LOCAL_PATH)/platform/third_party/android/libxml2 \ - $(LOCAL_PATH)/platform/third_party/android/libjpeg + $(LOCAL_PATH)/platform -LOCAL_LDLIBS := -L$(call host-path, $(LOCAL_PATH)/platform/third_party/android/libraries/$(TARGET_ARCH_ABI)) \ - -lGLESv1_CM -llog -lz \ - -lpng \ - -lxml2 \ - -ljpeg +LOCAL_LDLIBS := -lGLESv1_CM \ + -llog \ + -lz + +LOCAL_STATIC_LIBRARIES := png_static_prebuilt +LOCAL_STATIC_LIBRARIES += xml2_static_prebuilt +LOCAL_STATIC_LIBRARIES += jpeg_static_prebuilt # define the macro to compile through support/zip_support/ioapi.c LOCAL_CFLAGS := -DUSE_FILE32API - + include $(BUILD_SHARED_LIBRARY) + +# note that the import-module calls are relative to the parent directory +# this simplifies makefiles that use this module +# it requires only one entry in NDK_MODULE_PATH - the module search path +$(call import-module,cocos2dx/platform/third_party/android/modules/libpng) +$(call import-module,cocos2dx/platform/third_party/android/modules/libxml2) +$(call import-module,cocos2dx/platform/third_party/android/modules/libjpeg) diff --git a/cocos2dx/platform/third_party/android/modules/libjpeg/Android.mk b/cocos2dx/platform/third_party/android/modules/libjpeg/Android.mk new file mode 100644 index 0000000000..6650eeb07d --- /dev/null +++ b/cocos2dx/platform/third_party/android/modules/libjpeg/Android.mk @@ -0,0 +1,8 @@ +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) +LOCAL_MODULE := jpeg_static_prebuilt +LOCAL_MODULE_FILENAME := jpeg +LOCAL_SRC_FILES := libs/$(TARGET_ARCH_ABI)/libjpeg.a +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include +include $(PREBUILT_STATIC_LIBRARY) diff --git a/cocos2dx/platform/third_party/android/libjpeg/jconfig.h b/cocos2dx/platform/third_party/android/modules/libjpeg/include/jconfig.h similarity index 100% rename from cocos2dx/platform/third_party/android/libjpeg/jconfig.h rename to cocos2dx/platform/third_party/android/modules/libjpeg/include/jconfig.h diff --git a/cocos2dx/platform/third_party/android/libjpeg/jconfig_linux.h b/cocos2dx/platform/third_party/android/modules/libjpeg/include/jconfig_linux.h similarity index 100% rename from cocos2dx/platform/third_party/android/libjpeg/jconfig_linux.h rename to cocos2dx/platform/third_party/android/modules/libjpeg/include/jconfig_linux.h diff --git a/cocos2dx/platform/third_party/android/libjpeg/jconfig_win.h b/cocos2dx/platform/third_party/android/modules/libjpeg/include/jconfig_win.h similarity index 100% rename from cocos2dx/platform/third_party/android/libjpeg/jconfig_win.h rename to cocos2dx/platform/third_party/android/modules/libjpeg/include/jconfig_win.h diff --git a/cocos2dx/platform/third_party/android/libjpeg/jerror.h b/cocos2dx/platform/third_party/android/modules/libjpeg/include/jerror.h similarity index 100% rename from cocos2dx/platform/third_party/android/libjpeg/jerror.h rename to cocos2dx/platform/third_party/android/modules/libjpeg/include/jerror.h diff --git a/cocos2dx/platform/third_party/android/libjpeg/jmorecfg.h b/cocos2dx/platform/third_party/android/modules/libjpeg/include/jmorecfg.h similarity index 100% rename from cocos2dx/platform/third_party/android/libjpeg/jmorecfg.h rename to cocos2dx/platform/third_party/android/modules/libjpeg/include/jmorecfg.h diff --git a/cocos2dx/platform/third_party/android/libjpeg/jpeglib.h b/cocos2dx/platform/third_party/android/modules/libjpeg/include/jpeglib.h similarity index 100% rename from cocos2dx/platform/third_party/android/libjpeg/jpeglib.h rename to cocos2dx/platform/third_party/android/modules/libjpeg/include/jpeglib.h diff --git a/cocos2dx/platform/third_party/android/libraries/armeabi-v7a/libjpeg.a.REMOVED.git-id b/cocos2dx/platform/third_party/android/modules/libjpeg/libs/armeabi-v7a/libjpeg.a.REMOVED.git-id similarity index 100% rename from cocos2dx/platform/third_party/android/libraries/armeabi-v7a/libjpeg.a.REMOVED.git-id rename to cocos2dx/platform/third_party/android/modules/libjpeg/libs/armeabi-v7a/libjpeg.a.REMOVED.git-id diff --git a/cocos2dx/platform/third_party/android/libraries/armeabi/libjpeg.a.REMOVED.git-id b/cocos2dx/platform/third_party/android/modules/libjpeg/libs/armeabi/libjpeg.a.REMOVED.git-id similarity index 100% rename from cocos2dx/platform/third_party/android/libraries/armeabi/libjpeg.a.REMOVED.git-id rename to cocos2dx/platform/third_party/android/modules/libjpeg/libs/armeabi/libjpeg.a.REMOVED.git-id diff --git a/cocos2dx/platform/third_party/android/libraries/x86/libjpeg.a.REMOVED.git-id b/cocos2dx/platform/third_party/android/modules/libjpeg/libs/x86/libjpeg.a.REMOVED.git-id similarity index 100% rename from cocos2dx/platform/third_party/android/libraries/x86/libjpeg.a.REMOVED.git-id rename to cocos2dx/platform/third_party/android/modules/libjpeg/libs/x86/libjpeg.a.REMOVED.git-id diff --git a/cocos2dx/platform/third_party/android/modules/libpng/Android.mk b/cocos2dx/platform/third_party/android/modules/libpng/Android.mk new file mode 100644 index 0000000000..a45560e59b --- /dev/null +++ b/cocos2dx/platform/third_party/android/modules/libpng/Android.mk @@ -0,0 +1,8 @@ +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) +LOCAL_MODULE := png_static_prebuilt +LOCAL_MODULE_FILENAME := png +LOCAL_SRC_FILES := libs/$(TARGET_ARCH_ABI)/libpng.a +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include +include $(PREBUILT_STATIC_LIBRARY) diff --git a/cocos2dx/platform/third_party/android/libpng/png.h.REMOVED.git-id b/cocos2dx/platform/third_party/android/modules/libpng/include/png.h.REMOVED.git-id similarity index 100% rename from cocos2dx/platform/third_party/android/libpng/png.h.REMOVED.git-id rename to cocos2dx/platform/third_party/android/modules/libpng/include/png.h.REMOVED.git-id diff --git a/cocos2dx/platform/third_party/android/libpng/pngconf.h b/cocos2dx/platform/third_party/android/modules/libpng/include/pngconf.h similarity index 100% rename from cocos2dx/platform/third_party/android/libpng/pngconf.h rename to cocos2dx/platform/third_party/android/modules/libpng/include/pngconf.h diff --git a/cocos2dx/platform/third_party/android/libraries/armeabi-v7a/libpng.a.REMOVED.git-id b/cocos2dx/platform/third_party/android/modules/libpng/libs/armeabi-v7a/libpng.a.REMOVED.git-id similarity index 100% rename from cocos2dx/platform/third_party/android/libraries/armeabi-v7a/libpng.a.REMOVED.git-id rename to cocos2dx/platform/third_party/android/modules/libpng/libs/armeabi-v7a/libpng.a.REMOVED.git-id diff --git a/cocos2dx/platform/third_party/android/libraries/armeabi/libpng.a.REMOVED.git-id b/cocos2dx/platform/third_party/android/modules/libpng/libs/armeabi/libpng.a.REMOVED.git-id similarity index 100% rename from cocos2dx/platform/third_party/android/libraries/armeabi/libpng.a.REMOVED.git-id rename to cocos2dx/platform/third_party/android/modules/libpng/libs/armeabi/libpng.a.REMOVED.git-id diff --git a/cocos2dx/platform/third_party/android/libraries/x86/libpng.a.REMOVED.git-id b/cocos2dx/platform/third_party/android/modules/libpng/libs/x86/libpng.a.REMOVED.git-id similarity index 100% rename from cocos2dx/platform/third_party/android/libraries/x86/libpng.a.REMOVED.git-id rename to cocos2dx/platform/third_party/android/modules/libpng/libs/x86/libpng.a.REMOVED.git-id diff --git a/cocos2dx/platform/third_party/android/modules/libxml2/Android.mk b/cocos2dx/platform/third_party/android/modules/libxml2/Android.mk new file mode 100644 index 0000000000..060f9bd629 --- /dev/null +++ b/cocos2dx/platform/third_party/android/modules/libxml2/Android.mk @@ -0,0 +1,8 @@ +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) +LOCAL_MODULE := xml2_static_prebuilt +LOCAL_MODULE_FILENAME := xml2 +LOCAL_SRC_FILES := libs/$(TARGET_ARCH_ABI)/libxml2.a +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include +include $(PREBUILT_STATIC_LIBRARY) diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/DOCBparser.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/DOCBparser.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/DOCBparser.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/DOCBparser.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/HTMLparser.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/HTMLparser.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/HTMLparser.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/HTMLparser.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/HTMLtree.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/HTMLtree.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/HTMLtree.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/HTMLtree.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/SAX.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/SAX.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/SAX.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/SAX.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/SAX2.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/SAX2.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/SAX2.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/SAX2.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/c14n.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/c14n.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/c14n.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/c14n.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/catalog.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/catalog.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/catalog.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/catalog.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/chvalid.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/chvalid.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/chvalid.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/chvalid.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/debugXML.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/debugXML.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/debugXML.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/debugXML.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/dict.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/dict.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/dict.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/dict.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/encoding.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/encoding.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/encoding.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/encoding.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/entities.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/entities.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/entities.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/entities.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/globals.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/globals.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/globals.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/globals.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/hash.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/hash.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/hash.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/hash.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/list.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/list.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/list.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/list.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/nanoftp.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/nanoftp.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/nanoftp.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/nanoftp.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/nanohttp.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/nanohttp.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/nanohttp.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/nanohttp.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/parser.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/parser.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/parser.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/parser.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/parserInternals.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/parserInternals.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/parserInternals.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/parserInternals.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/pattern.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/pattern.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/pattern.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/pattern.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/relaxng.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/relaxng.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/relaxng.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/relaxng.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/schemasInternals.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/schemasInternals.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/schemasInternals.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/schemasInternals.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/schematron.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/schematron.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/schematron.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/schematron.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/threads.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/threads.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/threads.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/threads.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/tree.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/tree.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/tree.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/tree.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/uri.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/uri.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/uri.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/uri.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/valid.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/valid.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/valid.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/valid.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xinclude.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xinclude.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xinclude.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xinclude.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xlink.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xlink.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xlink.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xlink.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xmlIO.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlIO.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xmlIO.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlIO.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xmlautomata.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlautomata.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xmlautomata.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlautomata.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xmlerror.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlerror.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xmlerror.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlerror.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xmlexports.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlexports.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xmlexports.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlexports.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xmlmemory.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlmemory.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xmlmemory.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlmemory.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xmlmodule.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlmodule.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xmlmodule.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlmodule.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xmlreader.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlreader.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xmlreader.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlreader.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xmlregexp.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlregexp.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xmlregexp.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlregexp.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xmlsave.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlsave.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xmlsave.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlsave.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xmlschemas.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlschemas.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xmlschemas.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlschemas.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xmlschemastypes.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlschemastypes.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xmlschemastypes.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlschemastypes.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xmlstring.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlstring.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xmlstring.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlstring.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xmlunicode.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlunicode.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xmlunicode.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlunicode.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xmlversion.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlversion.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xmlversion.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlversion.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xmlwriter.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlwriter.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xmlwriter.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xmlwriter.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xpath.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xpath.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xpath.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xpath.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xpathInternals.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xpathInternals.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xpathInternals.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xpathInternals.h diff --git a/cocos2dx/platform/third_party/android/libxml2/libxml/xpointer.h b/cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xpointer.h similarity index 100% rename from cocos2dx/platform/third_party/android/libxml2/libxml/xpointer.h rename to cocos2dx/platform/third_party/android/modules/libxml2/include/libxml/xpointer.h diff --git a/cocos2dx/platform/third_party/android/libraries/armeabi-v7a/libxml2.a.REMOVED.git-id b/cocos2dx/platform/third_party/android/modules/libxml2/libs/armeabi-v7a/libxml2.a.REMOVED.git-id similarity index 100% rename from cocos2dx/platform/third_party/android/libraries/armeabi-v7a/libxml2.a.REMOVED.git-id rename to cocos2dx/platform/third_party/android/modules/libxml2/libs/armeabi-v7a/libxml2.a.REMOVED.git-id diff --git a/cocos2dx/platform/third_party/android/libraries/armeabi/libxml2.a.REMOVED.git-id b/cocos2dx/platform/third_party/android/modules/libxml2/libs/armeabi/libxml2.a.REMOVED.git-id similarity index 100% rename from cocos2dx/platform/third_party/android/libraries/armeabi/libxml2.a.REMOVED.git-id rename to cocos2dx/platform/third_party/android/modules/libxml2/libs/armeabi/libxml2.a.REMOVED.git-id diff --git a/cocos2dx/platform/third_party/android/libraries/x86/libxml2.a.REMOVED.git-id b/cocos2dx/platform/third_party/android/modules/libxml2/libs/x86/libxml2.a.REMOVED.git-id similarity index 100% rename from cocos2dx/platform/third_party/android/libraries/x86/libxml2.a.REMOVED.git-id rename to cocos2dx/platform/third_party/android/modules/libxml2/libs/x86/libxml2.a.REMOVED.git-id