From c3c9acbe1b4c4859527520810d17e7c25eb27d9b Mon Sep 17 00:00:00 2001
From: zhaohang <zhaohang44@huawei.com>
Date: Mon, 13 Nov 2023 10:58:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E8=B6=85=E5=A4=A7=E5=87=BD?=
 =?UTF-8?q?=E6=95=B0=E5=91=8A=E8=AD=A6=20Signed-off-by:=20zhaohang=20<zhao?=
 =?UTF-8?q?hang44@huawei.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module_info/compile_info_loader.py        | 58 ++++++++++++-------
 1 file changed, 36 insertions(+), 22 deletions(-)

diff --git a/tools/deps_guard/elf_file_mgr/module_info/compile_info_loader.py b/tools/deps_guard/elf_file_mgr/module_info/compile_info_loader.py
index e9ac1fa..d31ded4 100755
--- a/tools/deps_guard/elf_file_mgr/module_info/compile_info_loader.py
+++ b/tools/deps_guard/elf_file_mgr/module_info/compile_info_loader.py
@@ -65,11 +65,7 @@ class CompileInfoLoader(object):
 				info["moduleName"] = ""
 			if "version_script" in item:
 				info["version_script"] = item["version_script"]
-			info["third_party"] = False
-			info["chipset"] = False
-			info["napi"] = False
-			info["innerapi"] = False
-			info["innerapi_declared"] = False
+			CompileInfoLoader.__fill_default_module_info(info)
 			if "shlib_type" in item:
 				info["shlib_type"] = item["shlib_type"]
 			if "innerapi_tags" in item:
@@ -78,25 +74,19 @@ class CompileInfoLoader(object):
 			res.append(info)
 		return res
 
+	@staticmethod
+	def __fill_default_module_info(info):
+		info["third_party"] = False
+		info["chipset"] = False
+		info["napi"] = False
+		info["innerapi"] = False
+		info["innerapi_declared"] = False
+
 	@staticmethod
 	def load(mgr, product_out_path):
 		info = CompileInfoLoader.__load_output_module_info(product_out_path)
 
-		defaultInfo = {
-			"subsystem": "unknown",
-			"componentName": "unknown",
-			"moduleName": "unknown",
-			"third_party": False,
-			"chipset": False,
-			"napi": False,
-			"sa_id": 0,
-			"labelPath": "",
-			"version_script": "",
-			"shlib_type": "",
-			"innerapi": False,
-			"innerapi_tags": [],
-			"innerapi_declared": False
-		}
+		defaultInfo = CompileInfoLoader.__get_defaul_info()
 
 		if info:
 			for item in info:
@@ -147,6 +137,30 @@ class CompileInfoLoader(object):
 				f.write(res)
 
 		# init platformsdk, chipsetsdk, innerapi flags
+		CompileInfoLoader.__update_elf(mgr)
+
+		# for component dependedBy_internal and dependedBy_external
+		CompileInfoLoader.__update_deps(mgr)
+
+	@staticmethod
+	def __get_defaul_info():
+		return {
+			"subsystem": "unknown",
+			"componentName": "unknown",
+			"moduleName": "unknown",
+			"third_party": False,
+			"chipset": False,
+			"napi": False,
+			"sa_id": 0,
+			"labelPath": "",
+			"version_script": "",
+			"shlib_type": "",
+			"innerapi": False,
+			"innerapi_tags": [],
+			"innerapi_declared": False
+		}
+	@staticmethod
+	def __update_elf(mgr):
 		for elf in mgr.get_all():
 			elf["deps_internal"] = []
 			elf["deps_external"] = []
@@ -173,8 +187,8 @@ class CompileInfoLoader(object):
 			if elf["sa_id"] > 0 or elf["type"] == "bin":
 				elf["modGroup"] = "pentry"
 
-		# for component dependedBy_internal and dependedBy_external
-
+	@staticmethod
+	def __update_deps(mgr):
 		platformsdks = []
 		chipsetsdks = []
 		innerapi_ccs = []
-- 
Gitee