shorten and clear lib name on Android.mk (#325)

* use shorter and clear lib module name on Android.mk * fix typo
cocos2d · Sep 17, 2018 · 972cfcf · 972cfcf
1 parent 5835cc8
commit 972cfcf
Show file tree

Hide file tree

Showing 20 changed files with 40 additions and 41 deletions.
diff --git a/Box2D/prebuilt/android/Android.mk b/Box2D/prebuilt/android/Android.mk
@@ -2,8 +2,8 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE    := box2d_static
-LOCAL_MODULE_FILENAME := box2d_static
+LOCAL_MODULE    := ext_box2d
+LOCAL_MODULE_FILENAME := box2d
 LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libbox2d.a
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include
 LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)/../../include

diff --git a/android-specific/pvmp3dec/Android.mk b/android-specific/pvmp3dec/Android.mk
@@ -57,7 +57,7 @@ LOCAL_CFLAGS += -Werror
 LOCAL_CLANG := true
 LOCAL_SANITIZE := signed-integer-overflow
 
-LOCAL_MODULE := libpvmp3dec
+LOCAL_MODULE := ext_pvmp3dec
 
 LOCAL_ARM_MODE := arm
 

diff --git a/android-specific/tremolo/Android.mk b/android-specific/tremolo/Android.mk
@@ -42,6 +42,6 @@ LOCAL_EXPORT_C_INCLUDES := \
 
 LOCAL_ARM_MODE := arm
 
-LOCAL_MODULE := libvorbisidec
+LOCAL_MODULE := ext_vorbisidec
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/bullet/prebuilt/android/Android.mk b/bullet/prebuilt/android/Android.mk
@@ -2,51 +2,50 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE    := bullet_static
-LOCAL_MODULE_FILENAME := bullet_static
+LOCAL_MODULE    := ext_bullet
+LOCAL_MODULE_FILENAME := bullet
 LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libLinearMath.a
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include
 LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)/../../include/bullet
-LOCAL_STATIC_LIBRARIES += cocos_bulletcollision_static
-LOCAL_STATIC_LIBRARIES += cocos_bulletdynamics_static
-LOCAL_STATIC_LIBRARIES += cocos_bulletmultithreaded_static
-# LOCAL_STATIC_LIBRARIES += cocos_linearmath_static
-LOCAL_STATIC_LIBRARIES += cocos_minicl_static
+LOCAL_STATIC_LIBRARIES += bulletc
+LOCAL_STATIC_LIBRARIES += bulletd
+LOCAL_STATIC_LIBRARIES += bulletm
+LOCAL_STATIC_LIBRARIES += minicl
 include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := cocos_bulletcollision_static
+LOCAL_MODULE := bulletc
 LOCAL_MODULE_FILENAME := bulletcollision
 LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libBulletCollision.a
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include
-LOCAL_STATIC_LIBRARIES += cocos_linearmath_static
+LOCAL_STATIC_LIBRARIES += linearmath
 include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := cocos_bulletdynamics_static
+LOCAL_MODULE := bulletd
 LOCAL_MODULE_FILENAME := bulletdynamics
 LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libBulletDynamics.a
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include
-LOCAL_STATIC_LIBRARIES += cocos_bulletcollision_static
-LOCAL_STATIC_LIBRARIES += cocos_linearmath_static
+LOCAL_STATIC_LIBRARIES += bulletc
+LOCAL_STATIC_LIBRARIES += linearmath
 include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := cocos_bulletmultithreaded_static
+LOCAL_MODULE := bulletm
 LOCAL_MODULE_FILENAME := bulletmultithreaded
 LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libBulletMultiThreaded.a
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include
 include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := cocos_linearmath_static
+LOCAL_MODULE := linearmath
 LOCAL_MODULE_FILENAME := linearmath
 LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libLinearMath.a
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include
 include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := cocos_minicl_static
+LOCAL_MODULE := minicl
 LOCAL_MODULE_FILENAME := minicl
 LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libMiniCL.a
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include

diff --git a/chipmunk/prebuilt/android/Android.mk b/chipmunk/prebuilt/android/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := cocos_chipmunk_static
+LOCAL_MODULE := ext_chipmunk
 LOCAL_MODULE_FILENAME := chipmunk
 LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libchipmunk.a
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include

diff --git a/curl/prebuilt/android/Android.mk b/curl/prebuilt/android/Android.mk
@@ -1,10 +1,10 @@
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := cocos_curl_static
+LOCAL_MODULE := ext_curl
 LOCAL_MODULE_FILENAME := curl
 LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libcurl.a
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include/android
-LOCAL_STATIC_LIBRARIES += cocos_ssl_static
-LOCAL_STATIC_LIBRARIES += cocos_crypto_static
+LOCAL_STATIC_LIBRARIES += ext_ssl
+LOCAL_STATIC_LIBRARIES += ext_crypto
 include $(PREBUILT_STATIC_LIBRARY)
diff --git a/flatbuffers/Android.mk b/flatbuffers/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := cocos_flatbuffers_static
+LOCAL_MODULE := ext_flatbuffers
 
 LOCAL_MODULE_FILENAME := flatbuffers
 

diff --git a/freetype2/prebuilt/android/Android.mk b/freetype2/prebuilt/android/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := cocos_freetype2_static
+LOCAL_MODULE := ext_freetype2
 LOCAL_MODULE_FILENAME := freetype2
 LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libfreetype.a
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include/android \

diff --git a/jpeg/prebuilt/android/Android.mk b/jpeg/prebuilt/android/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := cocos_jpeg_static
+LOCAL_MODULE := ext_jpeg
 LOCAL_MODULE_FILENAME := jpeg
 LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libjpeg.a
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include/android

diff --git a/lua/luajit/prebuilt/android/Android.mk b/lua/luajit/prebuilt/android/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE    := luajit_static
+LOCAL_MODULE    := ext_luajit
 LOCAL_MODULE_FILENAME := libluajit
 LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libluajit.a
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include

diff --git a/openssl/prebuilt/android/Android.mk b/openssl/prebuilt/android/Android.mk
@@ -2,13 +2,13 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := cocos_crypto_static
+LOCAL_MODULE := ext_crypto
 LOCAL_MODULE_FILENAME := crypto
 LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libcrypto.a
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include/android
 include $(PREBUILT_STATIC_LIBRARY)
 
-LOCAL_MODULE := cocos_ssl_static
+LOCAL_MODULE := ext_ssl
 LOCAL_MODULE_FILENAME := ssl
 LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libssl.a
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include/android

diff --git a/png/prebuilt/android/Android.mk b/png/prebuilt/android/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := cocos_png_static
+LOCAL_MODULE := ext_png
 LOCAL_MODULE_FILENAME := png
 LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libpng.a
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include/android

diff --git a/recast/Android.mk b/recast/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := recast_static
+LOCAL_MODULE := ext_recast
 
 LOCAL_MODULE_FILENAME := librecast
 

diff --git a/spidermonkey/prebuilt/android/Android.mk b/spidermonkey/prebuilt/android/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE    := spidermonkey_static
+LOCAL_MODULE    := ext_spidermonkey
 LOCAL_MODULE_FILENAME := js_static
 LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libjs_static.a
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include/android

diff --git a/sqlite3/Android.mk b/sqlite3/Android.mk
diff --git a/tiff/prebuilt/android/Android.mk b/tiff/prebuilt/android/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := cocos_tiff_static
+LOCAL_MODULE := ext_tiff
 LOCAL_MODULE_FILENAME := tiff
 LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libtiff.a
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include/android

diff --git a/uv/prebuilt/android/Android.mk b/uv/prebuilt/android/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE    := uv_static
+LOCAL_MODULE    := ext_uv
 LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libuv_a.a
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include
 

diff --git a/webp/prebuilt/android/Android.mk b/webp/prebuilt/android/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := cocos_webp_static
+LOCAL_MODULE := ext_webp
 LOCAL_MODULE_FILENAME := webp
 LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libwebp.a
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include/android

diff --git a/websockets/prebuilt/android/Android.mk b/websockets/prebuilt/android/Android.mk
@@ -1,15 +1,15 @@
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE    := websockets_static
-LOCAL_MODULE_FILENAME := libwebsockets_static
+LOCAL_MODULE    := ext_websockets
+LOCAL_MODULE_FILENAME := websockets
 LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libwebsockets.a
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include/android
 LOCAL_CPPFLAGS := -D__STDC_LIMIT_MACROS=1
 LOCAL_EXPORT_CPPFLAGS := -D__STDC_LIMIT_MACROS=1
 
-LOCAL_STATIC_LIBRARIES += cocos_ssl_static
-LOCAL_STATIC_LIBRARIES += cocos_crypto_static
-LOCAL_STATIC_LIBRARIES += uv_static
+LOCAL_STATIC_LIBRARIES += ext_ssl
+LOCAL_STATIC_LIBRARIES += ext_crypto
+LOCAL_STATIC_LIBRARIES += ext_uv
 
 include $(PREBUILT_STATIC_LIBRARY)
diff --git a/zlib/prebuilt/android/Android.mk b/zlib/prebuilt/android/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := cocos_zlib_static
+LOCAL_MODULE := ext_zlib
 LOCAL_MODULE_FILENAME := zlib
 LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libz.a
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include