Skip to content

Commit f6f4b13

Browse files
author
zhangbin
committed
Improve the logic of gen-libs with external libraries tremolo & pvmp3dec.
1 parent ad0fcb1 commit f6f4b13

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

plugins/plugin_generate/configs/gen_libs_config.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
"external/recast/Android.mk",
3737
"external/flatbuffers/Android.mk",
3838
"external/Box2D/Android.mk",
39+
"external/android-specific/tremolo/Android.mk",
40+
"external/android-specific/pvmp3dec/Android.mk",
3941
"cocos/editor-support/cocosbuilder/Android.mk",
4042
"extensions/Android.mk",
4143
"cocos/3d/Android.mk",

plugins/plugin_generate/gen_prebuilt_mk.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818

1919
class MKGenerator(object):
2020

21-
SRC_FILE_CFG_PATTERN = r"^LOCAL_SRC_FILES[ \t]+[\:\+]=[ \t]+.+"
21+
SRC_FILE_CFG_PATTERN = r"^LOCAL_SRC_FILES[ \t]*[\:\+]*=[ \t]*.+"
2222
INCLUDE_CFG_PATTERN = r"^include[ \t]+\$\(BUILD_STATIC_LIBRARY\)"
2323

24-
LIB_MODULE_PATTERN = r"^LOCAL_MODULE[ \t]+\:=[ \t]+(.+)"
25-
LIB_MODULE_FILENAME_PATTERN = r"^LOCAL_MODULE_FILENAME[ \t]+\:=[ \t]+(.+)"
24+
LIB_MODULE_PATTERN = r"^LOCAL_MODULE[ \t]*[\:]*=[ \t]*(.+)"
25+
LIB_MODULE_FILENAME_PATTERN = r"^LOCAL_MODULE_FILENAME[ \t]*[\:]*=[ \t]*(.+)"
2626

27-
EXPORT_INCLUDE_PATTERN = r"^LOCAL_EXPORT_C_INCLUDES[ \t]+[\:\+]=[ \t]+(.+)"
27+
EXPORT_INCLUDE_PATTERN = r"^LOCAL_EXPORT_C_INCLUDES[ \t]*[\:\+]*=[ \t]*(.+)"
2828
INCLUDE_MODULE_PATTERN = r"^\$\(call[ \t]*import-module,[ \t]*(.*)\)"
2929

3030

@@ -72,7 +72,10 @@ def get_lib_file_name(self, lines):
7272
if module_file_name is not None:
7373
ret = "%s.a" % module_file_name
7474
elif module_name is not None:
75-
ret = "lib%s.a" % module_name
75+
if module_name.startswith('lib'):
76+
ret = "%s.a" % module_name
77+
else:
78+
ret = "lib%s.a" % module_name
7679

7780
return ret
7881

0 commit comments

Comments
 (0)