openharmony/developtools_integration_verification
1
0
Fork 0
mirror of https://github.com/openharmony/developtools_integration_verification.git synced 2026-08-25 12:39:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

!331 回退 'Pull Request !324 : 消除不满足语言规范的告警'

Browse Source 
Merge pull request !331 from openharmony_ci/revert-merge-324-master
This commit is contained in:
openharmony_ci
2024-04-12 11:40:32 +00:00
committed by Gitee
parent 3eab69a3cb 841f49a806
commit cb5295147e
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/deps_guard/elf_file_mgr/elf_file_mgr.py
+3 -3
View File
@@ -221,15 +221,15 @@ class ElfFileMgr(object):
if not path.startswith("/"):
path = "/" + path
if path.find("/lib64/") > 0:
path_order = "/system/lib64:/vendor/lib64:/vendor/lib64/chipsetsdk:/system/lib64/ndk:/system/lib64/chipset-pub-sdk:/system/lib64/chipset-sdk:/system/lib64/platformsdk:/system/lib64/priv-platformsdk:/system/lib64/priv-module:/system/lib64/module:/system/lib64/module/data:/system/lib64/module/multimedia:/system/lib:/vendor/lib:/system/lib/ndk:/system/lib/chipset-pub-sdk:/system/lib/chipset-sdk:/system/lib/platformsdk:/system/lib/priv-platformsdk:/system/lib/priv-module:/system/lib/module:/system/lib/module/data:/system/lib/module/multimedia:/lib64:/lib:/usr/local/lib:/usr/lib"
pathOrder = "/system/lib64:/vendor/lib64:/vendor/lib64/chipsetsdk:/system/lib64/ndk:/system/lib64/chipset-pub-sdk:/system/lib64/chipset-sdk:/system/lib64/platformsdk:/system/lib64/priv-platformsdk:/system/lib64/priv-module:/system/lib64/module:/system/lib64/module/data:/system/lib64/module/multimedia:/system/lib:/vendor/lib:/system/lib/ndk:/system/lib/chipset-pub-sdk:/system/lib/chipset-sdk:/system/lib/platformsdk:/system/lib/priv-platformsdk:/system/lib/priv-module:/system/lib/module:/system/lib/module/data:/system/lib/module/multimedia:/lib64:/lib:/usr/local/lib:/usr/lib"
else:
path_order = "/system/lib:/vendor/lib:/vendor/lib/chipsetsdk:/system/lib/ndk:/system/lib/chipset-pub-sdk:/system/lib/chipset-sdk:/system/lib/platformsdk:/system/lib/priv-platformsdk:/system/lib/priv-module:/system/lib/module:/system/lib/module/data:/system/lib/module/multimedia:/lib:/usr/local/lib:/usr/lib"
pathOrder = "/system/lib:/vendor/lib:/vendor/lib/chipsetsdk:/system/lib/ndk:/system/lib/chipset-pub-sdk:/system/lib/chipset-sdk:/system/lib/platformsdk:/system/lib/priv-platformsdk:/system/lib/priv-module:/system/lib/module:/system/lib/module/data:/system/lib/module/multimedia:/lib:/usr/local/lib:/usr/lib"
if path.rfind("/") < 0:
return 1000
path = path[:path.rfind("/")]
paths = path_order.split(':')
paths = pathOrder.split(':')
idx = 0
for p in paths:
if p == path:
tools/deps_guard/elf_file_mgr/hdi/hdi_parser.py
+1 -1
View File
@@ -27,7 +27,7 @@ class HdiParser(object):
hdi_tool = os.path.join(product_out_path, "obj/drivers/hdf_core/framework/tools/hc-gen/hc-gen")
hcs_file = os.path.join(product_out_path, "packages/phone/vendor/etc/hdfconfig/hdf_default.hcb")
out_file = os.path.join(product_out_path, "device_info.hcs")
subprocess.Popen([hdi_tool, "-d", hcs_file, "-o", out_file]).wait()
subprocess.Popen('%s -d "%s" -o "%s"' % (hdi_tool, hcs_file, out_file), shell=True).wait()
try:
with open(out_file) as f:
lines = f.readlines()
tools/deps_guard/rules_checker/chipsetsdk.py
+1 -3
View File
@@ -138,9 +138,7 @@ class ChipsetSDKRule(BaseRule):
headers.append(item)
try:
with os.fdopen(os.open(os.path.join(self.get_mgr().get_product_images_path(),
"chipsetsdk_info.json"),
os.O_WRONLY | os.O_CREAT, 0o644), "w") as f:
with open(os.path.join(self.get_mgr().get_product_images_path(), "chipsetsdk_info.json"), "w") as f:
json.dump(headers, f, indent=4)
except:
pass