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 1da3ccef78979f5ff406b0beba5df8f55c8dcf79..625bd952ec3d32346a582d08c4cfdd93b1fc7b16 100755 --- a/tools/deps_guard/elf_file_mgr/elf_file_mgr.py +++ b/tools/deps_guard/elf_file_mgr/elf_file_mgr.py @@ -260,7 +260,12 @@ class ElfFileMgr(object): continue tmp_name = os.path.dirname(src) tmp_name = os.path.join(tmp_name, target) - link_elf = ElfFile(tmp_name, self._prefix) + if name in ["libc.so"]: + tmp_name = os.path.normpath(tmp_name) + norm_prefix = os.path.normpath(self._prefix) + "/" + link_elf = ElfFile(tmp_name, norm_prefix) + else: + link_elf = ElfFile(tmp_name, self._prefix) return self.get_elf_by_path(link_elf["path"]) diff --git a/tools/deps_guard/elf_file_mgr/elf_walker.py b/tools/deps_guard/elf_file_mgr/elf_walker.py index 6d3b3fcc5acb1c5eed5926c7eea59bc461f8256a..9e47b518b630c32f4bf7f0b479805ea3368b3a50 100755 --- a/tools/deps_guard/elf_file_mgr/elf_walker.py +++ b/tools/deps_guard/elf_file_mgr/elf_walker.py @@ -57,9 +57,6 @@ class ELFWalker(): if os.path.islink(_asset_file): if _asset_file.find(".so") > 0: target = os.readlink(_asset_file) - if target.startswith("./"): - print("***link_file {} >> {}".format(_asset_file, target)) - target = target[2:] self._links[_asset_file] = target continue if not os.path.isfile(_asset_file): diff --git a/tools/deps_guard/rules/ChipsetSDK/chipsetsdk_info.json b/tools/deps_guard/rules/ChipsetSDK/chipsetsdk_info.json index fcdc55ce142e71129fe0631e8c58b7f670b38978..348b15d59bc9ac1c96fdab71f185c9adf5a66336 100644 --- a/tools/deps_guard/rules/ChipsetSDK/chipsetsdk_info.json +++ b/tools/deps_guard/rules/ChipsetSDK/chipsetsdk_info.json @@ -11,6 +11,12 @@ "path": "//build/common/musl:musl-libc.so", "headers": [] }, + { + "name": "build_framework:musl-libc.so", + "so_file_name": "ld-musl-aarch64.so.1", + "path": "//build/common/musl:musl-libc.so", + "headers": [] + }, { "name": "build_framework:musl-libcxx.so", "so_file_name": "libc++.so",