Merge pull request #407 from natural-law/gen-libs-error

Improve the logic of gen-libs with external libraries tremolo & pvmp3dec.

Author: Bin Zhang

plugins/plugin_generate/configs/gen_libs_config.json

@@ -36,6 +36,8 @@
         "external/recast/Android.mk",
         "external/flatbuffers/Android.mk",
         "external/Box2D/Android.mk",
+        "external/android-specific/tremolo/Android.mk",
+        "external/android-specific/pvmp3dec/Android.mk",
         "cocos/editor-support/cocosbuilder/Android.mk",
         "extensions/Android.mk",
         "cocos/3d/Android.mk",

plugins/plugin_generate/gen_libs.py

@@ -443,7 +443,11 @@ def modify_binary_mk(self):
         android_libs = os.path.join(self.lib_dir, "android")
         android_mks = self.cfg_info[LibsCompiler.KEY_ANDROID_MKS]
         for mk_file in android_mks:
-            mk_file_path = os.path.join(self.repo_x, mk_file)
+            mk_file_path = os.path.normpath(os.path.join(self.repo_x, mk_file))
+            if not os.path.isfile(mk_file_path):
+                Logging.warning(MultiLanguage.get_string('COMPILE_ERROR_GRALEW_NOT_EXIST_FMT', mk_file_path))
+                continue
+
             dst_file_path = os.path.join(os.path.dirname(mk_file_path), "prebuilt-mk", os.path.basename(mk_file_path))
             tmp_obj = gen_prebuilt_mk.MKGenerator(mk_file_path, android_libs, dst_file_path)
             tmp_obj.do_generate()

plugins/plugin_generate/gen_prebuilt_mk.py

@@ -18,13 +18,13 @@
 
 class MKGenerator(object):
 
-    SRC_FILE_CFG_PATTERN = r"^LOCAL_SRC_FILES[ \t]+[\:\+]=[ \t]+.+"
+    SRC_FILE_CFG_PATTERN = r"^LOCAL_SRC_FILES[ \t]*[\:\+]*=[ \t]*.+"
     INCLUDE_CFG_PATTERN  = r"^include[ \t]+\$\(BUILD_STATIC_LIBRARY\)"
 
-    LIB_MODULE_PATTERN = r"^LOCAL_MODULE[ \t]+\:=[ \t]+(.+)"
-    LIB_MODULE_FILENAME_PATTERN   = r"^LOCAL_MODULE_FILENAME[ \t]+\:=[ \t]+(.+)"
+    LIB_MODULE_PATTERN = r"^LOCAL_MODULE[ \t]*[\:]*=[ \t]*(.+)"
+    LIB_MODULE_FILENAME_PATTERN   = r"^LOCAL_MODULE_FILENAME[ \t]*[\:]*=[ \t]*(.+)"
 
-    EXPORT_INCLUDE_PATTERN = r"^LOCAL_EXPORT_C_INCLUDES[ \t]+[\:\+]=[ \t]+(.+)"
+    EXPORT_INCLUDE_PATTERN = r"^LOCAL_EXPORT_C_INCLUDES[ \t]*[\:\+]*=[ \t]*(.+)"
     INCLUDE_MODULE_PATTERN = r"^\$\(call[ \t]*import-module,[ \t]*(.*)\)"
 
 
@@ -72,7 +72,10 @@ def get_lib_file_name(self, lines):
         if module_file_name is not None:
             ret = "%s.a" % module_file_name
         elif module_name is not None:
-            ret = "lib%s.a" % module_name
+            if module_name.startswith('lib'):
+                ret = "%s.a" % module_name
+            else:
+                ret = "lib%s.a" % module_name
 
         return ret