From 38b4cdecc8bb7d99d9ef0e019b65081642a5ef21 Mon Sep 17 00:00:00 2001 From: zhuzhihui7 Date: Wed, 4 Jun 2025 16:05:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E7=BC=96=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhuzhihui7 --- bundle.json | 14 +++++++++----- es2panda/BUILD.gn | 22 +++++++++------------- es2panda/es2abc_config.gni | 3 +++ ets2panda/BUILD.gn | 4 ++-- merge_abc/BUILD.gn | 15 ++++++++------- 5 files changed, 31 insertions(+), 27 deletions(-) diff --git a/bundle.json b/bundle.json index aaab390cf3..764d6fe548 100644 --- a/bundle.json +++ b/bundle.json @@ -1,5 +1,5 @@ { - "name": "@arkcompiller/ets_frontend", + "name": "@ohos/ets_frontend", "description": "支持应用TS/JS语言代码的编译，行为符合ArkUI框架需要的Strict模式的ES2015标准", "version": "3.1", "license": "Apache License 2.0", @@ -22,11 +22,15 @@ "runtime_core", "zlib", "bounds_checking_function", - "protobuf" - ], - "third_party": [ + "protobuf", "json", - "icu" + "icu", + + "napi", + "toolchain", + "vixl", + "init", + "elfio" ] }, "build": { diff --git a/es2panda/BUILD.gn b/es2panda/BUILD.gn index d7f663a2bb..79a0795427 100644 --- a/es2panda/BUILD.gn +++ b/es2panda/BUILD.gn @@ -293,12 +293,14 @@ config("es2abc_config_src") { config("es2abc_config_common") { configs = [ "$ark_root:ark_config", - "$sdk_libc_secshared_config", + + # "$sdk_libc_secshared_config", "$ark_root/libpandafile:arkfile_public_config", "$ark_root/libpandabase:arkbase_public_config", "$ark_root/assembler:arkassembler_public_config", "$ark_root/abc2program:abc2program_public_config", - "$ark_third_party_root/json:nlohmann_json_config", + + # "$ark_third_party_root/json:nlohmann_json_config", ":es2abc_config_src", ] @@ -346,7 +348,7 @@ isa_gen = "${ark_root}/isa/gen.rb" isa_gen_data = "$root_gen_dir/isa/isa.yaml" isa_gen_require = "${ark_root}/isa/isapi.rb" action_foreach("gen_isa_headers") { - deps = [ "//arkcompiler/runtime_core/isa:isa_combine" ] + # deps = [ "//arkcompiler/runtime_core/isa:isa_combine" ] template_files = [ "isa.h.erb", @@ -359,7 +361,7 @@ action_foreach("gen_isa_headers") { sources += [ rebase_path("${keywords_templates_dir}/${file}") ] } outputs = [ "${generated_header_dir}/{{source_name_part}}" ] - + external_deps = [ "runtime_core:isa_combine" ] script = "scripts/gen_isa.sh" inputs = [ "${isa_gen}", @@ -394,21 +396,15 @@ ohos_static_library("es2panda_lib") { "../merge_abc:panda_assembly_proto_public_config", ] - include_dirs = [ - "${target_out_dir}", - "//third_party/icu/icu4c/source/common", - "//third_party/icu/icu4c/source/i18n", - "//third_party/icu/icu4c/source", - ] + include_dirs = [ "${target_out_dir}" ] deps = [ ":gen_isa_headers", ":gen_keywords_headers", - "$ark_third_party_root/icu/icu4c:static_icuuc", "../merge_abc:panda_assembly_proto_static", ] - external_deps = [] + external_deps = [ "icu:static_icuuc" ] if (!is_arkui_x) { external_deps += [ "json:nlohmann_json_static", @@ -432,8 +428,8 @@ ohos_static_library("es2panda_lib") { "$ark_root/libpandabase:libarkbase_frontend_static", "$ark_root/libpandafile:libarkfile_frontend_static", "$ark_root/libziparchive:libarkziparchive_frontend_static", - "$ark_third_party_root/json:nlohmann_json_static", ] + external_deps += [ "json:nlohmann_json_static" ] if (enable_bytecode_optimizer) { deps += [ "$ark_root/bytecode_optimizer:libarkbytecodeopt_frontend_static", diff --git a/es2panda/es2abc_config.gni b/es2panda/es2abc_config.gni index 7f9c8c833a..1f9f28b7da 100644 --- a/es2panda/es2abc_config.gni +++ b/es2panda/es2abc_config.gni @@ -33,7 +33,10 @@ if (host_toolchain == toolchain_mac) { } else { es2abc_out_root = get_label_info("$es2abc_root:es2panda($toolchain_linux)", "root_out_dir") + # toolchain_linux = host_toolchain = //build/toolchain/linux:clang_x64 es2abc_build_deps = [ "$es2abc_root:es2panda($toolchain_linux)" ] + # ERROR at //arkcompiler/ets_frontend/es2panda/es2abc_config.gni:38:25: + # Unable to load "/hudaxia/part_compile/binarys/arkcompiler/ets_frontend/innerapis/es2panda/clang_x64/BUILD.gn". } es2abc_build_path = es2abc_out_root + "/arkcompiler/ets_frontend" diff --git a/ets2panda/BUILD.gn b/ets2panda/BUILD.gn index acf87843fe..485edd504d 100644 --- a/ets2panda/BUILD.gn +++ b/ets2panda/BUILD.gn @@ -1098,10 +1098,10 @@ ohos_source_set("libes2panda_frontend_static") { ":gen_es2panda_lexer_keywords_h", ":isa_gen_es2panda_formats_h", ":isa_gen_es2panda_isa_h", - "$ark_third_party_root/icu/icu4c:static_icui18n", - "$ark_third_party_root/icu/icu4c:static_icuuc", ] external_deps = [ + "icu:static_icui18n", + "icu:static_icuuc", "runtime_core:libarktsassembler_package", "runtime_core:libarktsbase_package", "runtime_core:libarktscompiler_package", diff --git a/merge_abc/BUILD.gn b/merge_abc/BUILD.gn index 54bdb3148c..05e257ba7e 100644 --- a/merge_abc/BUILD.gn +++ b/merge_abc/BUILD.gn @@ -52,7 +52,7 @@ config("panda_assembly_proto_public_config") { } assembly_proto_configs = [ - sdk_libc_secshared_config, + # sdk_libc_secshared_config, "$ark_root:ark_config", ":panda_assembly_proto_public_config", "$ark_root/assembler:arkassembler_public_config", @@ -155,8 +155,10 @@ ohos_source_set("assembly_proto_static") { "$ark_root/assembler:libarkassembler_frontend_static", "$ark_root/libpandabase:libarkbase_frontend_static", "$ark_root/libpandafile:libarkfile_frontend_static", - "$ark_third_party_root/protobuf:protobuf_lite_static", - "$ark_third_party_root/protobuf:protobuf_static", + ] + external_deps = [ + "protobuf:protobuf_lite_static", + "protobuf:protobuf_static", ] } @@ -196,7 +198,7 @@ ohos_executable("merge_abc") { include_dirs = [ "./src" ] configs = [ - sdk_libc_secshared_config, + # sdk_libc_secshared_config, "$ark_root:ark_config", ":panda_assembly_proto_public_config", "$ark_root/assembler:arkassembler_public_config", @@ -207,12 +209,11 @@ ohos_executable("merge_abc") { deps = [ ":panda_assembly_proto_static", - "$ark_third_party_root/icu/icu4c:static_icuuc", "../es2panda:es2panda_lib", ] - + external_deps = [ "icu:static_icuuc" ] if (!is_arkui_x) { - external_deps = [ "runtime_core:libarkziparchive_frontend_static" ] + external_deps += [ "runtime_core:libarkziparchive_frontend_static" ] } else { deps += [ "$ark_root/libziparchive:libarkziparchive_frontend_static" ] } -- Gitee From c463bbd57e475f5c1686af259103f9951d229236 Mon Sep 17 00:00:00 2001 From: qianyong325 Date: Thu, 12 Jun 2025 14:11:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?ets=5Ffrontend=E7=8B=AC=E7=AB=8B=E7=BC=96?= =?UTF-8?q?=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: qianyong325 --- bundle.json | 2 +- merge_abc/BUILD.gn | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bundle.json b/bundle.json index 764d6fe548..83eb533c98 100644 --- a/bundle.json +++ b/bundle.json @@ -25,7 +25,7 @@ "protobuf", "json", "icu", - + "openssl", "napi", "toolchain", "vixl", diff --git a/merge_abc/BUILD.gn b/merge_abc/BUILD.gn index 05e257ba7e..4d6ccf08e8 100644 --- a/merge_abc/BUILD.gn +++ b/merge_abc/BUILD.gn @@ -110,7 +110,7 @@ if (!ark_standalone_build) { } action("arkcompiler_generate_proto") { - deps = [ "$ark_third_party_root/protobuf:protoc($host_toolchain)" ] + deps = [ "protobuf:protoc" ] args = [] sources = [] outputs = proto_generated_header + proto_generated_source -- Gitee