diff --git a/tools/deps_guard/elf_file_mgr/elf_file_mgr.py b/tools/deps_guard/elf_file_mgr/elf_file_mgr.py index 31c5173f..3f6669ab 100755 --- a/tools/deps_guard/elf_file_mgr/elf_file_mgr.py +++ b/tools/deps_guard/elf_file_mgr/elf_file_mgr.py @@ -249,7 +249,7 @@ class ElfFileMgr(object): if not dep_elf: self._not_found_depened_files.append({"caller": elf["name"], "callee": lib}) print("Warning: can not find depended library [" + lib + "] for " + elf["name"]) - break + continue if not isinstance(dep_elf, list): self.add_dependence(elf, dep_elf) diff --git a/tools/deps_guard/rules/chipsetsdk_dep_whitelist.json b/tools/deps_guard/rules/chipsetsdk_dep_whitelist.json index efa09150..cae9c25b 100644 --- a/tools/deps_guard/rules/chipsetsdk_dep_whitelist.json +++ b/tools/deps_guard/rules/chipsetsdk_dep_whitelist.json @@ -10483,5 +10483,12 @@ "dep_file_name": "ld-musl-arm.so.1", "dep_file_path": "system/lib/ld-musl-arm.so.1", "description": "libalsa_midi.so with innerapi_tags [passthrough_indirect] cannot depend system only file ld-musl-arm.so.1 with //build/common/musl:ld-musl-arm.so.1" + }, + { + "so_file_name": "libEGL.so", + "so_file_path": "system/lib/platformsdk/libEGL.so", + "dep_file_name": "libmali-bifrost-g52-g7p0-ohos.so", + "dep_file_path": "vendor/lib/chipsetsdk/libmali-bifrost-g52-g7p0-ohos.so", + "description": "system_only cannot depend system only lib libmali-bifrost-g52-g7p0-ohos.so in vendor/lib/chipsetsdk/libmali-bifrost-g52-g7p0-ohos.so" } -] \ No newline at end of file +] diff --git a/tools/deps_guard/rules_checker/base_innerapi_rule.py b/tools/deps_guard/rules_checker/base_innerapi_rule.py index 4095d80a..978697ba 100644 --- a/tools/deps_guard/rules_checker/base_innerapi_rule.py +++ b/tools/deps_guard/rules_checker/base_innerapi_rule.py @@ -42,8 +42,7 @@ class BaseInnerapiRule(BaseRule): for mod in self.get_mgr().get_all(): innerapi_tags = mod["innerapi_tags"] # mod is system only scene - if self.is_only(mod) == "system" and \ - all(item in self.__valid_system_tags for item in innerapi_tags): + if self.is_only(mod) == "system" and all(item in self.__valid_system_tags for item in innerapi_tags): for dep in mod["deps"]: callee = dep["callee"] callee_innerapi_tags = callee["innerapi_tags"] @@ -69,9 +68,6 @@ class BaseInnerapiRule(BaseRule): continue else: self.error("NEED MODIFY: system only module %s depends on wrong module as %s in %s, dep module path is %s" - - - %(mod["name"], callee["name"], mod["labelPath"], callee["path"])) passed = False # mod is vendor only scene @@ -105,3 +101,4 @@ class BaseInnerapiRule(BaseRule): %(mod["name"], callee["name"], mod["labelPath"], callee["path"])) passed = False return passed +