From 378d32f65e8e46adec3e600861f3d1c87e6255b5 Mon Sep 17 00:00:00 2001
From: xietingwei <xietingwei@h-partners.com>
Date: Thu, 24 Apr 2025 11:59:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E5=8A=A8=E6=80=81=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: xietingwei <xietingwei@h-partners.com>
---
 hb/util/component_util.py                     |  9 +--
 .../config/download_part_whitelist.json       | 70 +++++--------------
 2 files changed, 19 insertions(+), 60 deletions(-)

diff --git a/hb/util/component_util.py b/hb/util/component_util.py
index e0bbf5d5b1..c6f09cf2cb 100644
--- a/hb/util/component_util.py
+++ b/hb/util/component_util.py
@@ -158,12 +158,9 @@ def gen_default_deps_json(variant, root_path, has_test=False):
     download_part_whitelist = IoUtil.read_json_file(download_part_whitelist_path)
     for part_name in part_name_list:
         # Default Dependency List 
-        common_deps = []
-        if part_name in download_part_whitelist["components"]:
-            for dependencie in download_part_whitelist["components"][part_name]["dependencies"]:
-                common_deps += download_part_whitelist["dependencies"][dependencie]
-            for dep in common_deps:
-                default_deps_json.append(dep)
+        if part_name in download_part_whitelist.keys():
+            for dependencies_part in download_part_whitelist[part_name]:
+                default_deps_json.append(dependencies_part)
     if has_test:
         default_deps_json.append('developer_test')
 
diff --git a/indep_configs/config/download_part_whitelist.json b/indep_configs/config/download_part_whitelist.json
index 631314ab7c..7a37a9fa22 100644
--- a/indep_configs/config/download_part_whitelist.json
+++ b/indep_configs/config/download_part_whitelist.json
@@ -1,55 +1,17 @@
 {
-    "dependencies": {
-      "rust_common": [
-        "rust",
-        "rust_cxx",
-        "rust_libc",
-        "rust_syn",
-        "rust_proc_macro2",
-        "rust_quote",
-        "rust_unicode_ident",
-        "rust_bindgen"
-      ],
-      "typescript_common": [
-        "typescript"
-      ]
-    },
-    "components": {
-      "ets_utils": {
-        "dependencies": ["typescript_common"]
-      },
-      "ylong_runtime": {
-        "dependencies": ["rust_common"]
-      },
-      "ylong_json": {
-        "dependencies": ["rust_common"]
-      },
-      "c_utils": {
-        "dependencies": ["rust_common"]
-      },
-      "samgr": {
-        "dependencies": ["rust_common"]
-      },
-      "safwk": {
-        "dependencies": ["rust_common"]
-      },
-      "ipc": {
-        "dependencies": ["rust_common"]
-      },
-      "faultloggerd": {
-        "dependencies": ["rust_common"]
-      },
-      "graphic_2d": {
-        "dependencies": ["rust_common"]
-      },
-      "hitrace": {
-        "dependencies": ["rust_common"]
-      },
-      "code_signature": {
-        "dependencies": ["rust_common"]
-      },
-      "input": {
-        "dependencies": ["rust_common"]
-      }
-    }
-  }
\ No newline at end of file
+  "ets_utils": ["typescript"],
+  "ylong_runtime": ["rust", "rust_cxx", "rust_libc", "rust_syn", "rust_proc_macro2", "rust_quote", "rust_unicode_ident", "rust_bindgen"],
+  "ylong_json": ["rust", "rust_cxx", "rust_libc", "rust_syn", "rust_proc_macro2", "rust_quote", "rust_unicode_ident", "rust_bindgen"],
+  "c_utils": ["rust", "rust_cxx", "rust_libc", "rust_syn", "rust_proc_macro2", "rust_quote", "rust_unicode_ident", "rust_bindgen"],
+  "samgr": ["rust", "rust_cxx", "rust_libc", "rust_syn", "rust_proc_macro2", "rust_quote", "rust_unicode_ident", "rust_bindgen", "ylong_runtime"],
+  "safwk": ["rust", "rust_cxx", "rust_libc", "rust_syn", "rust_proc_macro2", "rust_quote", "rust_unicode_ident", "rust_bindgen"],
+  "ipc": ["rust", "rust_cxx", "rust_libc", "rust_syn", "rust_proc_macro2", "rust_quote", "rust_unicode_ident", "rust_bindgen"],
+  "faultloggerd": ["rust", "rust_cxx", "rust_libc", "rust_syn", "rust_proc_macro2", "rust_quote", "rust_unicode_ident", "rust_bindgen"],
+  "graphic_2d": ["rust", "rust_cxx", "rust_libc", "rust_syn", "rust_proc_macro2", "rust_quote", "rust_unicode_ident", "rust_bindgen"],
+  "hitrace": ["rust", "rust_cxx", "rust_libc", "rust_syn", "rust_proc_macro2", "rust_quote", "rust_unicode_ident", "rust_bindgen"],
+  "code_signature": ["rust", "rust_cxx", "rust_libc", "rust_syn", "rust_proc_macro2", "rust_quote", "rust_unicode_ident", "rust_bindgen"],
+  "input": ["rust", "rust_cxx", "rust_libc", "rust_syn", "rust_proc_macro2", "rust_quote", "rust_unicode_ident", "rust_bindgen"],
+  "hisysevent": ["rust", "rust_cxx", "rust_libc", "rust_syn", "rust_proc_macro2", "rust_quote", "rust_unicode_ident", "rust_bindgen"],
+  "hdc": ["rust", "rust_cxx", "rust_libc", "rust_syn", "rust_proc_macro2", "rust_quote", "rust_unicode_ident", "rust_bindgen"],
+  "file_api": ["typescript"]
+}
\ No newline at end of file
-- 
Gitee