From bd38ef23595440a42f6628ee99657a2ea113edec Mon Sep 17 00:00:00 2001 From: Keerecles Date: Sat, 26 Jul 2025 10:30:10 +0800 Subject: [PATCH] inner api Change-Id: Ic48cb627190b2147b83c0dd39d73a9f3ff6c0b3a Signed-off-by: xieziang --- BUILD.gn | 69 +++++++++++++++++++++++++---------- bundle.json | 23 ++++++++++-- koala-wrapper/native/BUILD.gn | 13 +++---- 3 files changed, 75 insertions(+), 30 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index a46f9f867..e09491710 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -11,11 +11,14 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//build/config/components/sdk/interface.gni") import("//build/ohos.gni") import("//build/ohos/ace/ace.gni") import("//build/ohos_var.gni") -import("//foundation/arkui/ace_engine/ace_config.gni") -import("//interface/sdk-js/interface_config.gni") +if (!defined(is_arkui_x) || !is_arkui_x) { + import("//build/templates/bpf/ohos_bpf_config.gni") +} +import("//build/templates/cxx/prebuilt.gni") ets_loader_lib_dir = get_label_info(":build_ets_loader_library", "target_out_dir") + "/lib" @@ -34,7 +37,10 @@ ets_sysResource = get_label_info(":build_ets_sysResource", "target_out_dir") + "/sysResource.js" ets_loader_kit_configs_dir = get_label_info(":build_ets_loader_library", "target_out_dir") + "/kit_configs" -ets_component_dep = "//interface/sdk-js:ets_component" +ets_component_dep = "sdk:ets_component" +if (defined(is_arkui_x) && is_arkui_x) { + ets_component_dep = "//interface/sdk-js:ets_component" +} ets_component_out_dir = get_label_info(ets_component_dep, "target_out_dir") action("build_ets_loader_library") { @@ -43,12 +49,24 @@ action("build_ets_loader_library") { ":form_components", ":install_arkguard_tsc_declgen", ":server", - "//interface/sdk-js:ohos_declaration_ets", - "//interface/sdk-js:bundle_arkts", - "//interface/sdk-js:bundle_kits", - "//interface/sdk-js:ets_component", - "//interface/sdk-js:ets_internal_api", ] + if (defined(is_arkui_x) && is_arkui_x) { + deps += [ + "//interface/sdk-js:bundle_arkts", + "//interface/sdk-js:bundle_kits", + "//interface/sdk-js:ets_component", + "//interface/sdk-js:ets_internal_api", + "//interface/sdk-js:ohos_declaration_ets", + ] + } else { + external_deps = [ + "sdk:bundle_arkts_etc", + "sdk:bundle_kits_etc", + "sdk:ets_component_etc", + "sdk:ets_internal_api_etc", + "sdk:ohos_declaration_ets_api", + ] + } script = "build_ets_loader_library.py" depfile = "$target_gen_dir/$target_name.d" outputs = [ @@ -167,7 +185,6 @@ if (sdk_build_arkts) { ets_loader_sources = [ "compiler/compile_plugin.js", "compiler/config/obfuscateWhiteList.json5", - main_sources, "compiler/node_modules", "compiler/npm-install.js", "compiler/package-lock.json", @@ -176,6 +193,7 @@ ets_loader_sources = [ "compiler/tsconfig.esm.json", "compiler/tsconfig.json", "compiler/webpack.config.js", + main_sources, ] ohos_copy("ets_loader") { @@ -330,16 +348,30 @@ ohos_copy("ets_loader_ark_codegen") { outputs = [ target_out_dir + "/ets_loader_ark/codegen" ] } -ohos_copy("ohos_declaration_ets_ark") { - deps = [ "//interface/sdk-js:ohos_declaration_ets" ] +ohos_prebuilt_etc("ets_loader_ark_hap") { + source = "OAT.xml" + deps = [ ":ets_loader_ark_hap_inner" ] + install_enable = false + part_name = "ace_ets2bundle" + subsystem_name = "developtools" +} - sources = +ohos_copy("ohos_declaration_ets_ark") { + if (defined(is_arkui_x) && is_arkui_x) { + deps = [ "//interface/sdk-js:ohos_declaration_ets" ] + sources = [ root_out_dir + "/ohos_declaration/${sdk_type}/ohos_declaration_ets" ] - + + } else { + external_deps = [ "sdk:ohos_declaration_ets_api" ] + ets_ark_path = get_label_info("sdk:ohos_declaration_ets_api", + "target_out_dir") + "/../api" + sources = [ ets_ark_path ] + } outputs = [ target_out_dir + "/../api" ] } -group("ets_loader_ark_hap") { +group("ets_loader_ark_hap_inner") { deps = [ ":ets_loader_ark", ":ets_loader_ark_codegen", @@ -356,11 +388,10 @@ typescript_dir = get_label_info("//third_party/typescript:build_typescript", "target_out_dir") action("install_arkguard_tsc_declgen") { - static_core = "//arkcompiler/runtime_core/static_core" - deps = [ - "${static_core}/plugins/ets/tools/declgen_ts2sts:build_declgen", - "//arkcompiler/ets_frontend/arkguard:build_arkguard", - "//third_party/typescript:build_typescript", + external_deps = [ + "ets_frontend:build_arkguard_etc", + "runtime_core:build_declgen_etc", + "typescript:build_typescript_etc", ] script = "install_arkguard_tsc_declgen.py" args = [ diff --git a/bundle.json b/bundle.json index 2b6e5f0ea..17f39ed73 100644 --- a/bundle.json +++ b/bundle.json @@ -16,7 +16,12 @@ "standard" ], "deps": { - "components": [], + "components": [ + "node", + "sdk", + "ets_frontend", + "typescript" + ], "third_party": [ "typescript" ] @@ -24,15 +29,27 @@ "build": { "sub_component": [ "//developtools/ace_ets2bundle:ets_loader_component_config", - "//developtools/ace_ets2bundle:ets_loader_deps", "//developtools/ace_ets2bundle:ets_loader", "//developtools/ace_ets2bundle:ets_loader_library", - "//developtools/ace_ets2bundle:ets_loader_syntax", "//developtools/ace_ets2bundle:components", "//developtools/ace_ets2bundle:server", "//developtools/ace_ets2bundle:codegen", "//developtools/ace_ets2bundle:ets_loader_declaration", "//developtools/ace_ets2bundle:ets_loader_ark_hap" + ], + "inner_kits": [ + { + "name": "//developtools/ace_ets2bundle/arkui-plugins:ohos_ets_ui_plugins" + }, + { + "name": "//developtools/ace_ets2bundle/koala-wrapper:ohos_ets_koala_wrapper" + }, + { + "name": "//developtools/ace_ets2bundle:ets_loader_ark_hap" + }, + { + "name": "//developtools/ace_ets2bundle/arkui-plugins:ui_plugin" + } ] } } diff --git a/koala-wrapper/native/BUILD.gn b/koala-wrapper/native/BUILD.gn index a72d1d7a9..ab7989a90 100644 --- a/koala-wrapper/native/BUILD.gn +++ b/koala-wrapper/native/BUILD.gn @@ -13,12 +13,11 @@ import("//build/ohos.gni") -group("build_es2panda_lib") { - external_deps = [ "ets_frontend:ets2panda" ] -} - shared_library("es2panda") { - deps = [ ":build_es2panda_lib" ] + external_deps = [ + "ets_frontend:libes2panda_public_headers", + "node:node_header_notice", + ] sources = [ "../koalaui/interop/src/cpp/common-interop.cc", "../koalaui/interop/src/cpp/interop-logging.cc", @@ -36,8 +35,6 @@ shared_library("es2panda") { "../node_modules/node-api-headers/include", "../node_modules/node-addon-api", "./include", - "//arkcompiler/ets_frontend/ets2panda/public/", - "//third_party/node/src", rebase_path("$root_gen_dir/arkcompiler/ets_frontend/ets2panda/"), ] @@ -66,7 +63,7 @@ shared_library("es2panda") { "-fuse-ld=lld", "-Wl,--icf=all", "-Wl,--color-diagnostics", - "-m64" + "-m64", ] defines += [ "KOALA_MACOS" ] output_extension = "node" -- Gitee