From 15a84d56ce5ae642b7b78dac56a039cbbb0bf4bb Mon Sep 17 00:00:00 2001
From: handyohos <zhangxiaotian@huawei.com>
Date: Thu, 9 Feb 2023 12:17:45 +0800
Subject: [PATCH] Feature: add sa, hdi, chipsetsdk type info
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1) 为sa，hdi库增加shlib_type类型
2) 为chipsetsdk库增加innerapi_tags类型
3) innerapi_tags支持ndk

Signed-off-by: handyohos <zhangxiaotian@huawei.com>
Change-Id: If72ee71158dc391ef29b13ee005fbe3b0ec6e3dc

#I6DSU6
---
 tools/deps_guard/rules/ChipsetSDK/whitelist.json  |  2 +-
 .../rules/NO-Depends-On-NAPI/whitelist.json       | 15 +--------------
 .../rules/NO-Depends-On-SA/whitelist.json         | 10 ++--------
 tools/deps_guard/rules_checker/chipsetsdk.py      |  4 +++-
 4 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/tools/deps_guard/rules/ChipsetSDK/whitelist.json b/tools/deps_guard/rules/ChipsetSDK/whitelist.json
index 358c4c1..73f4ecd 100755
--- a/tools/deps_guard/rules/ChipsetSDK/whitelist.json
+++ b/tools/deps_guard/rules/ChipsetSDK/whitelist.json
@@ -5,6 +5,7 @@
 	"libhilog.so",
 	"libhilog_ndk.z.so",
 	"libhisysevent.z.so",
+	"libhicollie.z.so",
 	"libservice_checker.z.so",
 	"libbegetutil.z.so",
 	"libbeget_proxy.z.so",
@@ -57,7 +58,6 @@
 	"libhdi_input.z.so",
 
 	"libhitrace_meter.so",
-	"libinit_stub_empty.so",
 
 	// by libdisplay_layer_video.z.so for hispark taurus platform
 	"libhdi_video_layer_client.z.so",
diff --git a/tools/deps_guard/rules/NO-Depends-On-NAPI/whitelist.json b/tools/deps_guard/rules/NO-Depends-On-NAPI/whitelist.json
index 9666ce7..a0a14af 100644
--- a/tools/deps_guard/rules/NO-Depends-On-NAPI/whitelist.json
+++ b/tools/deps_guard/rules/NO-Depends-On-NAPI/whitelist.json
@@ -1,18 +1,5 @@
 [
-   "fileio",
-   "downloadsingle",
-   "tel_call_manager_api",
-   "rpc",
-   "color_picker",
    "accessibility",
-   "stationary",
    "remote_file_share_native",
-   "window_animation",
-   "cryptoframework_napi",
-   "rdb",
-   "distributeddataobject_impl",
-   "medialibrary",
-   "image",
-   "medical",
-   "devicestatus"
+   "medialibrary"
 ]
diff --git a/tools/deps_guard/rules/NO-Depends-On-SA/whitelist.json b/tools/deps_guard/rules/NO-Depends-On-SA/whitelist.json
index 5a948cc..c99e361 100755
--- a/tools/deps_guard/rules/NO-Depends-On-SA/whitelist.json
+++ b/tools/deps_guard/rules/NO-Depends-On-SA/whitelist.json
@@ -2,13 +2,7 @@
 	"liblbsservice_locator.z.so",
 	"libnetsys_native_manager.z.so",
 	"libresschedsvc.z.so",
-	"libedmservice.z.so",
 	"libavsession_service.z.so",
-	"libtime_service.z.so",
-	"libgeofence_service.z.so",
-	"libtimeline_service.z.so",
-	"libusagestatservice.z.so",
 	"libcomponent_sched_server.z.so",
-	"libsg_collect_service.z.so",
-	"libabnormal_efficiency_mgr_service.z.so"
-]
\ No newline at end of file
+	"libsg_collect_service.z.so"
+]
diff --git a/tools/deps_guard/rules_checker/chipsetsdk.py b/tools/deps_guard/rules_checker/chipsetsdk.py
index 538512d..88f3bcd 100755
--- a/tools/deps_guard/rules_checker/chipsetsdk.py
+++ b/tools/deps_guard/rules_checker/chipsetsdk.py
@@ -12,7 +12,9 @@ class ChipsetSDKRule(BaseRule):
 	def __is_chipsetsdk_tagged(self, mod):
 		if not "innerapi_tags" in mod:
 			return False
-		if "chipsetsdk" in mod["innerapi_tags"] or "csdk" in mod["innerapi_tags"]:
+		if "ndk" in mod["innerapi_tags"]:
+			return True
+		if mod["innerapi_tags"].endswith("chipsetsdk") or "chipsetsdk," in mod["innerapi_tags"]:
 			return True
 		return False
 
-- 
Gitee