Skip to content

Commit 972cfcf

Browse files
drelaptopminggo
drelaptop
authored and
minggo
committed
shorten and clear lib name on Android.mk (#325)
* use shorter and clear lib module name on Android.mk * fix typo
1 parent 5835cc8 commit 972cfcf

20 files changed

Lines changed: 40 additions & 41 deletions

File tree

‎Box2D/prebuilt/android/Android.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ LOCAL_PATH := $(call my-dir)
22

33
include $(CLEAR_VARS)
44

5-
LOCAL_MODULE := box2d_static
6-
LOCAL_MODULE_FILENAME := box2d_static
5+
LOCAL_MODULE := ext_box2d
6+
LOCAL_MODULE_FILENAME := box2d
77
LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libbox2d.a
88
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include
99
LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)/../../include

‎android-specific/pvmp3dec/Android.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ LOCAL_CFLAGS += -Werror
5757
LOCAL_CLANG := true
5858
LOCAL_SANITIZE := signed-integer-overflow
5959

60-
LOCAL_MODULE := libpvmp3dec
60+
LOCAL_MODULE := ext_pvmp3dec
6161

6262
LOCAL_ARM_MODE := arm
6363

‎android-specific/tremolo/Android.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ LOCAL_EXPORT_C_INCLUDES := \
4242

4343
LOCAL_ARM_MODE := arm
4444

45-
LOCAL_MODULE := libvorbisidec
45+
LOCAL_MODULE := ext_vorbisidec
4646

4747
include $(BUILD_STATIC_LIBRARY)

‎bullet/prebuilt/android/Android.mk‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,51 +2,50 @@ LOCAL_PATH := $(call my-dir)
22

33
include $(CLEAR_VARS)
44

5-
LOCAL_MODULE := bullet_static
6-
LOCAL_MODULE_FILENAME := bullet_static
5+
LOCAL_MODULE := ext_bullet
6+
LOCAL_MODULE_FILENAME := bullet
77
LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libLinearMath.a
88
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include
99
LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)/../../include/bullet
10-
LOCAL_STATIC_LIBRARIES += cocos_bulletcollision_static
11-
LOCAL_STATIC_LIBRARIES += cocos_bulletdynamics_static
12-
LOCAL_STATIC_LIBRARIES += cocos_bulletmultithreaded_static
13-
# LOCAL_STATIC_LIBRARIES += cocos_linearmath_static
14-
LOCAL_STATIC_LIBRARIES += cocos_minicl_static
10+
LOCAL_STATIC_LIBRARIES += bulletc
11+
LOCAL_STATIC_LIBRARIES += bulletd
12+
LOCAL_STATIC_LIBRARIES += bulletm
13+
LOCAL_STATIC_LIBRARIES += minicl
1514
include $(PREBUILT_STATIC_LIBRARY)
1615

1716
include $(CLEAR_VARS)
18-
LOCAL_MODULE := cocos_bulletcollision_static
17+
LOCAL_MODULE := bulletc
1918
LOCAL_MODULE_FILENAME := bulletcollision
2019
LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libBulletCollision.a
2120
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include
22-
LOCAL_STATIC_LIBRARIES += cocos_linearmath_static
21+
LOCAL_STATIC_LIBRARIES += linearmath
2322
include $(PREBUILT_STATIC_LIBRARY)
2423

2524
include $(CLEAR_VARS)
26-
LOCAL_MODULE := cocos_bulletdynamics_static
25+
LOCAL_MODULE := bulletd
2726
LOCAL_MODULE_FILENAME := bulletdynamics
2827
LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libBulletDynamics.a
2928
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include
30-
LOCAL_STATIC_LIBRARIES += cocos_bulletcollision_static
31-
LOCAL_STATIC_LIBRARIES += cocos_linearmath_static
29+
LOCAL_STATIC_LIBRARIES += bulletc
30+
LOCAL_STATIC_LIBRARIES += linearmath
3231
include $(PREBUILT_STATIC_LIBRARY)
3332

3433
include $(CLEAR_VARS)
35-
LOCAL_MODULE := cocos_bulletmultithreaded_static
34+
LOCAL_MODULE := bulletm
3635
LOCAL_MODULE_FILENAME := bulletmultithreaded
3736
LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libBulletMultiThreaded.a
3837
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include
3938
include $(PREBUILT_STATIC_LIBRARY)
4039

4140
include $(CLEAR_VARS)
42-
LOCAL_MODULE := cocos_linearmath_static
41+
LOCAL_MODULE := linearmath
4342
LOCAL_MODULE_FILENAME := linearmath
4443
LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libLinearMath.a
4544
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include
4645
include $(PREBUILT_STATIC_LIBRARY)
4746

4847
include $(CLEAR_VARS)
49-
LOCAL_MODULE := cocos_minicl_static
48+
LOCAL_MODULE := minicl
5049
LOCAL_MODULE_FILENAME := minicl
5150
LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libMiniCL.a
5251
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include

‎chipmunk/prebuilt/android/Android.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
LOCAL_PATH := $(call my-dir)
22

33
include $(CLEAR_VARS)
4-
LOCAL_MODULE := cocos_chipmunk_static
4+
LOCAL_MODULE := ext_chipmunk
55
LOCAL_MODULE_FILENAME := chipmunk
66
LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libchipmunk.a
77
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include

‎curl/prebuilt/android/Android.mk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
LOCAL_PATH := $(call my-dir)
22

33
include $(CLEAR_VARS)
4-
LOCAL_MODULE := cocos_curl_static
4+
LOCAL_MODULE := ext_curl
55
LOCAL_MODULE_FILENAME := curl
66
LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libcurl.a
77
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include/android
8-
LOCAL_STATIC_LIBRARIES += cocos_ssl_static
9-
LOCAL_STATIC_LIBRARIES += cocos_crypto_static
8+
LOCAL_STATIC_LIBRARIES += ext_ssl
9+
LOCAL_STATIC_LIBRARIES += ext_crypto
1010
include $(PREBUILT_STATIC_LIBRARY)

‎flatbuffers/Android.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
22

33
include $(CLEAR_VARS)
44

5-
LOCAL_MODULE := cocos_flatbuffers_static
5+
LOCAL_MODULE := ext_flatbuffers
66

77
LOCAL_MODULE_FILENAME := flatbuffers
88

‎freetype2/prebuilt/android/Android.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
LOCAL_PATH := $(call my-dir)
22

33
include $(CLEAR_VARS)
4-
LOCAL_MODULE := cocos_freetype2_static
4+
LOCAL_MODULE := ext_freetype2
55
LOCAL_MODULE_FILENAME := freetype2
66
LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libfreetype.a
77
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include/android \

‎jpeg/prebuilt/android/Android.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
LOCAL_PATH := $(call my-dir)
22

33
include $(CLEAR_VARS)
4-
LOCAL_MODULE := cocos_jpeg_static
4+
LOCAL_MODULE := ext_jpeg
55
LOCAL_MODULE_FILENAME := jpeg
66
LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libjpeg.a
77
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include/android

‎lua/luajit/prebuilt/android/Android.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
LOCAL_PATH := $(call my-dir)
22

33
include $(CLEAR_VARS)
4-
LOCAL_MODULE := luajit_static
4+
LOCAL_MODULE := ext_luajit
55
LOCAL_MODULE_FILENAME := libluajit
66
LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libluajit.a
77
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include

0 commit comments

Comments
 (0)