From bf795717769be6e812f86186f3833fc94e10cad0 Mon Sep 17 00:00:00 2001 From: xietingwei Date: Wed, 23 Apr 2025 14:43:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=90=86=E5=AF=B9libunwind=E7=9A=84?= =?UTF-8?q?=E7=89=B9=E6=AE=8A=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xietingwei --- templates/common/generate_component_package.py | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/templates/common/generate_component_package.py b/templates/common/generate_component_package.py index f25b0ee07b..2c6d451145 100644 --- a/templates/common/generate_component_package.py +++ b/templates/common/generate_component_package.py @@ -1075,7 +1075,9 @@ def _copy_dir(src_path, target_path): continue if not os.path.exists(target_path): os.makedirs(target_path) - shutil.copy2(path, os.path.join(target_path, file)) + # 打包时存在同名头文件时，使用先遍历到的 + if not os.path.exists(os.path.join(target_path, file)): + shutil.copy2(path, os.path.join(target_path, file)) return True @@ -1103,10 +1105,6 @@ def _copy_includes(args, module, includes: list): _sub_include = include.split(f"{part_path}/")[-1] split_include = include.split("//")[1] real_include_path = os.path.join(args.get("root_path"), split_include) - if args.get('part_name') == 'libunwind': - _out_dir = os.path.join(toolchain_includes_out_dir, _sub_include) - _copy_dir(real_include_path, _out_dir) - continue _copy_dir(real_include_path, toolchain_includes_out_dir) if not os.path.exists(includes_out_dir): os.makedirs(includes_out_dir) @@ -1115,10 +1113,6 @@ def _copy_includes(args, module, includes: list): _sub_include = include.split(f"{part_path}/")[-1] split_include = include.split("//")[1] real_include_path = os.path.join(args.get("root_path"), split_include) - if args.get('part_name') == 'libunwind': - _out_dir = os.path.join(includes_out_dir, _sub_include) - _copy_dir(real_include_path, _out_dir) - continue _copy_dir(real_include_path, includes_out_dir) print("_copy_includes has done ") @@ -1369,11 +1363,6 @@ def _generate_configs(fp, module, json_data, _part_name): fp.write(' visibility = [ ":*" ]\n') fp.write(' include_dirs = [\n') fp.write(' "includes",\n') - if module == 'libunwind': - fp.write(' "includes/libunwind-1.6.2",\n') - fp.write(' "includes/libunwind-1.6.2/src",\n') - fp.write(' "includes/libunwind-1.6.2/include",\n') - fp.write(' "includes/libunwind-1.6.2/include/tdep-arm",\n') if module == 'ability_runtime': fp.write(' "includes/context",\n') fp.write(' "includes/app",\n') -- Gitee