File tree Expand file tree Collapse file tree 2 files changed +10
-5
lines changed Expand file tree Collapse file tree 2 files changed +10
-5
lines changed Original file line number Diff line number Diff line change 36
36
" external/recast/Android.mk" ,
37
37
" external/flatbuffers/Android.mk" ,
38
38
" external/Box2D/Android.mk" ,
39
+ " external/android-specific/tremolo/Android.mk" ,
40
+ " external/android-specific/pvmp3dec/Android.mk" ,
39
41
" cocos/editor-support/cocosbuilder/Android.mk" ,
40
42
" extensions/Android.mk" ,
41
43
" cocos/3d/Android.mk" ,
Original file line number Diff line number Diff line change 18
18
19
19
class MKGenerator (object ):
20
20
21
- SRC_FILE_CFG_PATTERN = r"^LOCAL_SRC_FILES[ \t]+ [\:\+]=[ \t]+ .+"
21
+ SRC_FILE_CFG_PATTERN = r"^LOCAL_SRC_FILES[ \t]* [\:\+]* =[ \t]* .+"
22
22
INCLUDE_CFG_PATTERN = r"^include[ \t]+\$\(BUILD_STATIC_LIBRARY\)"
23
23
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]* (.+)"
26
26
27
- EXPORT_INCLUDE_PATTERN = r"^LOCAL_EXPORT_C_INCLUDES[ \t]+ [\:\+]=[ \t]+ (.+)"
27
+ EXPORT_INCLUDE_PATTERN = r"^LOCAL_EXPORT_C_INCLUDES[ \t]* [\:\+]* =[ \t]* (.+)"
28
28
INCLUDE_MODULE_PATTERN = r"^\$\(call[ \t]*import-module,[ \t]*(.*)\)"
29
29
30
30
@@ -72,7 +72,10 @@ def get_lib_file_name(self, lines):
72
72
if module_file_name is not None :
73
73
ret = "%s.a" % module_file_name
74
74
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
76
79
77
80
return ret
78
81
You can’t perform that action at this time.
0 commit comments