diff --git a/hb/util/component_util.py b/hb/util/component_util.py index e0bbf5d5b11126d6e01151ad34f5e66cdca34113..c6f09cf2cb1f47de07ec3fa043b29f2293e6a825 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 631314ab7c3c165b3b8d652c4a8f5f6bf58dc0b7..7a37a9fa2277c6a6119cb1998bb0ea9bdb0ca6ca 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