liangxinyan
2026-01-27 11:17:44 +08:00
parent f96b8dfb20
commit 5e31dc66c2
3 changed files with 11 additions and 7 deletions
@@ -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)
@@ -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"
}
]
]
@@ -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