Merge branch 'master' of git@gitcode.com:power_wang/developtools_integration_verification.git into 'master'

# Conflicts:
#   conflict tools/deps_guard/rules/ChipsetSDK/chipsetsdk_info.json

tools/deps_guard/elf_file_mgr/elf_file.py

@@ -54,7 +54,7 @@ class ElfFile(dict):
         if not os.access(self._f, os.F_OK):
             raise Exception("Cannot find lib: " + self._f)
         file_name = self._f_safe.split("/")[-1].strip("'")
-        dynamics = command_without_error("strings", self._f_safe, f"|grep -E 'lib([-_/a-zA-Z0-9.]+)\.so$'|grep -v ':'|grep -v {file_name}")
+        dynamics = command_without_error("strings", self._f_safe, f"|grep -E 'lib[-_/a-zA-Z0-9.]+\.so$'|grep -v ':'|grep -v {file_name}")
         res = []
         if dynamics:
             for line in dynamics:

tools/deps_guard/rules/ChipsetSDK/chipsetsdk_info.json

@@ -227,6 +227,12 @@
         "path": "//third_party/pulseaudio/ohosbuild/src/pulse:pulse",
         "headers": []
     },
+    {
+    	"name": "drivers_interface_sensor:libsensor_proxy_3.1",
+	    "so_file_name": "libsensor_proxy_3.1.z.so",
+    	"path": "//drivers/interface/sensor/v3_1:libsensor_proxy_3.1",
+	    "headers": []
+    },
     {
         "name": "hdf:libaudio_proxy_6.0",
         "so_file_name": "libaudio_proxy_6.0.z.so",

tools/deps_guard/rules_checker/chipsetsdk.py

@@ -147,9 +147,10 @@ class ChipsetSDKRule(BaseRule):
                 if innerapi["label"] != sdk["labelPath"]:
                     continue
                 got_headers = True
-                base = innerapi["header_base"]
-                for f in innerapi["header_files"]:
-                    item["headers"].append(os.path.join(base, f))
+                base = innerapi.get("header_base", None)
+                if base:
+                    for f in innerapi["header_files"]:
+                        item["headers"].append(os.path.join(base, f))
             headers.append(item)
 
         try:
@@ -183,10 +184,6 @@ class ChipsetSDKRule(BaseRule):
             if self.__is_chipsetsdk_indirect(mod):
                 self.__modules_with_chipsetsdk_indirect_tag.append(mod)
 
-            # Check chipset modules only
-            if mod["path"].startswith("system"):
-                continue
-
             # If callee is chipset module, it is OK
             if not mod["path"].endswith(".so"):
                 continue