Compile macro rectification

Signed-off-by: quguiren <quguiren@huawei.com>
This commit is contained in:
quguiren 2023-11-06 16:45:11 +08:00
parent 43b7e8609e
commit 291c818cd3
37 changed files with 73 additions and 77 deletions

View File

@ -32,9 +32,6 @@ declare_args() {
# Disable glfw window to build for PC preview scenario.
enable_glfw_window = false
# Enable when build for cross platform
is_cross_platform_build = false
# Enable metal in iOS or MacOS
shell_enable_metal = false
@ -52,7 +49,7 @@ declare_args() {
}
enable_dump_drawcmd = false
is_ohos_standard_system = is_standard_system && !build_cross_platform_version
is_ohos_standard_system = is_standard_system && !is_arkui_x
use_mingw_win = "${current_os}_${current_cpu}" == "mingw_x86_64"
use_mac = "${current_os}_${current_cpu}" == "mac_x64" ||
"${current_os}_${current_cpu}" == "mac_arm64"
@ -113,7 +110,7 @@ objcopy_clang = "$clang_base_path/bin/llvm-objcopy"
if (is_ohos_standard_system) {
objcopy_default = "//prebuilts/clang/ohos/linux-x86_64/llvm/bin/llvm-objcopy"
node_js_path = "//prebuilts/build-tools/common/nodejs/current/bin/"
} else if (is_cross_platform_build) {
} else if (is_arkui_x) {
if (host_os == "mac") {
objcopy_default = objcopy_clang
} else if (defined(aosp_objcopy)) {
@ -130,7 +127,7 @@ if (is_ohos_standard_system) {
hilog_deps = [ "hilog:libhilog" ]
ark_runtime_path = "//arkcompiler/runtime_core"
} else {
if (is_cross_platform_build) {
if (is_arkui_x) {
ace_engine_part = "ace_engine_cross"
} else {
ace_engine_part = "ace_engine_full"
@ -226,8 +223,8 @@ foreach(item, _adapters) {
if (defined(import_var.platforms)) {
foreach(platform, import_var.platforms) {
if (!is_cross_platform_build || (is_cross_platform_build && defined(
platform.cross_platform_support) &&
if (!is_arkui_x ||
(is_arkui_x && defined(platform.cross_platform_support) &&
platform.cross_platform_support)) {
if (defined(platform.name)) {
ace_platforms += [ platform ]

View File

@ -15,7 +15,7 @@ import("//build/ohos.gni")
platforms = []
is_ohos_standard_system = is_standard_system && !build_cross_platform_version
is_ohos_standard_system = is_standard_system && !is_arkui_x
if (is_ohos_standard_system) {
ohos_platform = {
name = "ohos"

View File

@ -82,7 +82,7 @@ ohos_source_set("preview_entrance_source") {
}
}
if (!is_cross_platform_build) {
if (!is_arkui_x) {
if (platform == "windows") {
defines -= [ "UNICODE" ]
deps += [ "//base/global/resource_management/frameworks/resmgr:global_resmgr_win" ]

View File

@ -37,7 +37,7 @@ template("libace_static") {
]
}
if (platform == "ohos_ng" || is_cross_platform_build) {
if (platform == "ohos_ng" || is_arkui_x) {
deps += [
"$ace_root/frameworks/bridge:framework_bridge_ng_$platform",
"$ace_root/frameworks/core:ace_core_ng_$platform",
@ -83,7 +83,7 @@ template("libace_static") {
# build-in ark js engine for preview
if (defined(config.use_build_in_js_engine) &&
config.use_build_in_js_engine && defined(config.ark_engine)) {
if (platform == "ohos_ng" || is_cross_platform_build) {
if (platform == "ohos_ng" || is_arkui_x) {
deps += [ "$ace_root/frameworks/bridge/declarative_frontend:declarative_js_engine_ng_ark_$platform" ]
} else {
deps += [

View File

@ -74,7 +74,7 @@ template("ace_base_source_set") {
if (platform != "windows") {
# add secure c API
include_dirs = [ "//third_party/bounds_checking_function/include" ]
if (is_cross_platform_build) {
if (is_arkui_x) {
deps += [ "//third_party/bounds_checking_function:libsec_static" ]
}
} else {
@ -82,7 +82,7 @@ template("ace_base_source_set") {
libs = [ "//prebuilts/mingw-w64/ohos/linux-x86_64/clang-mingw/x86_64-w64-mingw32/lib/libshlwapi.a" ]
}
if (is_cross_platform_build) {
if (is_arkui_x) {
deps += [ "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client_static" ]
} else {
external_deps += [ "graphic_2d:librender_service_client" ]
@ -93,14 +93,14 @@ template("ace_base_source_set") {
configs += [ "//third_party/curl:curl_config" ]
sources += [ "$ace_root/frameworks/base/network/download_manager.cpp" ]
deps += [ "$ace_root/frameworks/base/network:cacert.pem" ]
if (is_cross_platform_build) {
if (is_arkui_x) {
deps += [ "//third_party/curl:curl" ]
} else {
deps += [ "//third_party/curl:curl_shared" ]
}
}
if (is_cross_platform_build || platform != "ohos") {
if (is_arkui_x || platform != "ohos") {
deps += [ "//third_party/cJSON:cjson_static" ]
} else {
deps += [ "//third_party/cJSON:cjson" ]

View File

@ -149,7 +149,7 @@ template("bridge_common") {
# advance components using web or native plugins
if (defined(config.advance_components_support) &&
config.advance_components_support && !is_cross_platform_build) {
config.advance_components_support && !is_arkui_x) {
sources += [
"dom/dom_rich_text.cpp",
"dom/dom_web.cpp",
@ -157,7 +157,7 @@ template("bridge_common") {
}
if (defined(config.web_components_support) &&
config.web_components_support && !is_cross_platform_build) {
config.web_components_support && !is_arkui_x) {
sources += [
"dom/dom_rich_text.cpp",
"dom/dom_web.cpp",

View File

@ -27,7 +27,7 @@ template("declarative_frontend") {
defines += invoker.defines
configs = [ "$ace_root:ace_config" ]
if (platform == "ohos_ng" || is_cross_platform_build) {
if (platform == "ohos_ng" || is_arkui_x) {
sources = [
"ng/declarative_frontend_ng.cpp",
"ng/frontend_delegate_declarative_ng.cpp",
@ -97,7 +97,7 @@ gen_obj("ark_component") {
snapshot_dep = []
}
if (!is_cross_platform_build) {
if (!is_arkui_x) {
gen_obj("js_mock_system_plugin") {
input = "$root_out_dir/obj/ide/tools/previewer/automock/dist/jsMockSystemPlugin.js"
if (use_mac || use_mingw_win || use_linux || target_os == "ios") {
@ -452,7 +452,7 @@ template("declarative_js_engine") {
if (defined(config.web_components_support) &&
config.web_components_support) {
if (is_cross_platform_build) {
if (is_arkui_x) {
sources += [
"jsview/js_web.cpp",
"jsview/models/web_model_impl.cpp",
@ -520,7 +520,7 @@ template("declarative_js_engine") {
deps += [ "$ace_root/build:libace_compatible" ]
if (defined(config.build_container_scope_lib) &&
config.build_container_scope_lib) {
if (is_cross_platform_build) {
if (is_arkui_x) {
deps += [ "$ace_napi:ace_container_scope_static" ]
} else {
deps += [ "$ace_napi:ace_container_scope" ]
@ -540,7 +540,7 @@ template("declarative_js_engine") {
include_dirs = [ "//foundation/window/window_manager/interfaces/innerkits" ]
# add for cross_platfrom_build temporarily, shall be removed after external_deps is supported
if (is_cross_platform_build) {
if (is_arkui_x) {
configs += [ "$ark_ets_path:ark_jsruntime_public_config" ]
deps += [ "$ark_ets_path:libark_jsruntime_static" ]
if (defined(config.pixel_map_support) && config.pixel_map_support) {
@ -819,7 +819,7 @@ template("declarative_js_engine_ng") {
if (defined(config.web_components_support) &&
config.web_components_support) {
if (!is_cross_platform_build) {
if (!is_arkui_x) {
sources += [
"jsview/js_richtext.cpp",
"jsview/js_web.cpp",
@ -873,7 +873,7 @@ template("declarative_js_engine_ng") {
}
# add for cross_platfrom_build temporarily, shall be removed after external_deps is supported
if (is_cross_platform_build) {
if (is_arkui_x) {
sources -= [
"interfaces/profiler/js_profiler.cpp",
"jsview/js_location_button.cpp",

View File

@ -64,7 +64,7 @@ es2abc_gen_abc("gen_arkComponent_abc") {
out_puts = [ base_output_path + "/arkComponent.abc" ]
}
if (!is_cross_platform_build) {
if (!is_arkui_x) {
es2abc_gen_abc("gen_js_mock_system_plugin_abc") {
extra_visibility = [ ":*" ] # Only targets in this file can depend on this.
src_js = rebase_path(
@ -115,7 +115,7 @@ gen_obj("abc_ark_component") {
snapshot_dep = [ ":gen_arkComponent_abc" ]
}
if (!is_cross_platform_build) {
if (!is_arkui_x) {
gen_obj("abc_mock_system_plugin") {
input = base_output_path + "/jsMockSystemPlugin.abc"
if (use_mac || use_mingw_win || use_linux) {
@ -175,17 +175,17 @@ template("declarative_js_engine_ark") {
include_dirs += [ "${ace_root}/interfaces/inner_api/ace" ]
deps = []
if (!is_cross_platform_build) {
if (!is_arkui_x) {
deps +=
[ "${ace_root}/interfaces/inner_api/ace:ace_forward_compatibility" ]
}
if (platform == "ohos_ng" || is_cross_platform_build) {
if (platform == "ohos_ng" || is_arkui_x) {
sources += [
"jsi_animator_model_ng_build_impl.cpp",
"jsi_view_register_impl_ng.cpp",
]
if (is_cross_platform_build) {
if (is_arkui_x) {
defines += [ "CROSS_PLATFORM" ]
}
} else {
@ -199,7 +199,7 @@ template("declarative_js_engine_ark") {
external_deps = []
# add for cross_platfrom_build temporarily, shall be removed after external_deps is supported
if (is_cross_platform_build) {
if (is_arkui_x) {
configs += [ "$ark_ets_path:ark_jsruntime_public_config" ]
deps += [ "$ark_ets_path:libark_jsruntime_static" ]
public_deps = [ "//foundation/arkui/napi:ace_napi" ]
@ -215,7 +215,7 @@ template("declarative_js_engine_ark") {
sources += [ "utils/jsi_module_searcher.cpp" ]
} else if (defined(config.use_build_in_js_engine) &&
config.use_build_in_js_engine) {
if (platform == "ohos_ng" || is_cross_platform_build) {
if (platform == "ohos_ng" || is_arkui_x) {
sources += [
"$ace_root/frameworks/bridge/js_frontend/engine/common/js_api_perf.cpp",
"$ace_root/frameworks/bridge/js_frontend/engine/jsi/ark_js_runtime.cpp",

View File

@ -53,7 +53,7 @@ template("js_engine") {
deps += [ "$ace_root/build:libace_compatible" ]
if (defined(config.build_container_scope_lib) &&
config.build_container_scope_lib) {
if (is_cross_platform_build) {
if (is_arkui_x) {
deps += [ "$ace_napi:ace_container_scope_static" ]
} else {
external_deps += [ "napi:ace_container_scope" ]

View File

@ -124,7 +124,7 @@ template("js_engine_ark") {
}
# add for cross_platfrom_build temporarily, shall be removed after external_deps is supported
if (is_cross_platform_build) {
if (is_arkui_x) {
deps += [ "$ark_ets_path:libark_jsruntime_static" ]
if (defined(config.pixel_map_support) && config.pixel_map_support) {
configs += [

View File

@ -437,7 +437,7 @@ template("ace_core_source_set") {
}
defines += [ "TEXGINE_SUPPORT_FOR_OHOS" ]
}
if (is_cross_platform_build) {
if (is_arkui_x) {
deps += [ "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client_static" ]
} else {
if (ace_use_rosen_drawing) {
@ -457,7 +457,7 @@ template("ace_core_source_set") {
}
if (defined(config.web_components_support) &&
config.web_components_support && !is_cross_platform_build) {
config.web_components_support && !is_arkui_x) {
deps += [
"$ace_root/frameworks/core/components/text_overlay:ace_core_components_text_overlay_for_web_$platform",
"$ace_root/frameworks/core/components/web:ace_core_components_web_$platform",
@ -507,7 +507,7 @@ template("ace_core_source_set") {
if (defined(config.build_container_scope_lib) &&
config.build_container_scope_lib) {
sources -= [ "common/container_scope.cpp" ]
if (is_cross_platform_build) {
if (is_arkui_x) {
deps += [ "$ace_napi:ace_container_scope_static" ]
} else {
external_deps += [ "napi:ace_container_scope" ]
@ -530,7 +530,7 @@ template("ace_core_source_set") {
include_dirs +=
[ "//foundation/window/window_manager/interfaces/innerkits" ]
if (is_cross_platform_build) {
if (is_arkui_x) {
include_dirs += [
"//foundation/appframework/ability/ability_runtime/cross_platform/frameworks/native/base/event_handler/include",
"//foundation/appframework/ability/ability_runtime/cross_platform/interfaces/inner_api/error",
@ -774,7 +774,7 @@ template("ace_core_ng_source_set") {
"components/declaration/common/declaration.cpp",
]
include_dirs = []
if (is_cross_platform_build) {
if (is_arkui_x) {
include_dirs += [
"//foundation/appframework/ability/ability_runtime/cross_platform/frameworks/native/base/event_handler/include",
"//foundation/appframework/ability/ability_runtime/cross_platform/interfaces/inner_api/error",
@ -812,7 +812,7 @@ template("ace_core_ng_source_set") {
]
external_deps = []
if (is_cross_platform_build) {
if (is_arkui_x) {
deps += [ "$ace_flutter_engine_root:flutter_for_ng" ]
}
if (is_ohos) {
@ -833,7 +833,7 @@ template("ace_core_ng_source_set") {
if (defined(config.build_container_scope_lib) &&
config.build_container_scope_lib) {
sources -= [ "common/container_scope.cpp" ]
if (is_cross_platform_build) {
if (is_arkui_x) {
deps += [ "$ace_napi:ace_container_scope_static" ]
} else {
external_deps += [ "napi:ace_container_scope" ]
@ -855,7 +855,7 @@ template("ace_core_ng_source_set") {
"$ace_root/frameworks/core/components_ng/svg:ace_core_components_svg_ng_$platform",
"$ace_root/frameworks/core/components_ng/syntax:ace_core_components_syntax_ng_$platform",
]
if (is_cross_platform_build) {
if (is_arkui_x) {
deps -= [ "$ace_root/frameworks/core/components_ng/svg:ace_core_components_svg_ng_$platform" ]
}
@ -874,7 +874,7 @@ template("ace_core_ng_source_set") {
}
if (defined(config.web_components_support) &&
config.web_components_support) {
if (!is_cross_platform_build) {
if (!is_arkui_x) {
include_dirs += [
"$ability_runtime_path/interfaces/kits/native/appkit/app",
"//foundation/window/window_manager/interfaces/innerkits/wm",
@ -930,7 +930,7 @@ template("ace_core_ng_source_set") {
}
defines += [ "TEXGINE_SUPPORT_FOR_OHOS" ]
}
if (is_cross_platform_build) {
if (is_arkui_x) {
deps += [
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics_source_$platform",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client_static",

View File

@ -138,7 +138,7 @@ template("build_component") {
if (enable_graphic_text_gine) {
external_deps += [ "graphic_2d:rosen_text" ]
}
if (is_cross_platform_build) {
if (is_arkui_x) {
deps += [ "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client_static" ]
} else {
external_deps += [ "graphic_2d:librender_service_client" ]

View File

@ -115,7 +115,7 @@ template("build_component_ng") {
[ "$ace_flutter_engine_root/libtxt:thirdparty_lib_txt_$platform" ]
deps += [ "$ace_flutter_engine_root:flutter_engine_fml_$platform" ]
}
if (!is_cross_platform_build && defined(config.enable_drag_framework) &&
if (!is_arkui_x && defined(config.enable_drag_framework) &&
config.enable_drag_framework) {
external_deps += [
"device_status:devicestatus_client",
@ -133,8 +133,7 @@ template("build_component_ng") {
external_deps += [ "graphic_2d:rosen_text" ]
}
} else {
if (!is_cross_platform_build && defined(use_rosen_drawing) &&
use_rosen_drawing) {
if (!is_arkui_x && defined(use_rosen_drawing) && use_rosen_drawing) {
external_deps += [ "graphic_2d:2d_graphics" ]
} else {
if (enable_graphic_text_gine) {
@ -147,7 +146,7 @@ template("build_component_ng") {
if (defined(config.enable_rosen_backend) && config.enable_rosen_backend &&
defined(invoker.rosen_sources)) {
sources += invoker.rosen_sources
if (is_cross_platform_build) {
if (is_arkui_x) {
deps += [ "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client_static" ]
} else {
external_deps += [ "graphic_2d:librender_service_client" ]

View File

@ -114,7 +114,7 @@ template("build_component_plugin") {
# TODO: new skia configs
if (is_cross_platform_build) {
if (is_arkui_x) {
deps += [ "//plugins/libs/napi:napi_$platform" ]
} else {
deps += [ "//foundation/arkui/napi/:ace_napi" ]

View File

@ -491,7 +491,7 @@ build_component_ng("pattern_ng") {
if (is_ohos_standard_system) {
external_deps = [ "graphic_2d:librender_service_client" ]
} else if (is_cross_platform_build) {
} else if (is_arkui_x) {
deps = [ "$ace_graphic/rosen/modules/render_service_client:librender_service_client_static" ]
}
}

View File

@ -30,7 +30,7 @@ if (is_ohos_standard_system) {
}
build_component_ng("web_pattern_ng") {
if (is_cross_platform_build) {
if (is_arkui_x) {
sources = [
"cross_platform/web_delegate_cross.cpp",
"cross_platform/web_pattern.cpp",

View File

@ -73,7 +73,7 @@ template("ace_core_pipeline_source_set") {
if (defined(config.enable_rosen_backend) && config.enable_rosen_backend) {
sources += [ "base/rosen_render_context.cpp" ]
if (is_cross_platform_build) {
if (is_arkui_x) {
deps += [ "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client_static" ]
} else {
external_deps += [ "graphic_2d:librender_service_client" ]

View File

@ -57,7 +57,7 @@ template("ace_core_pipeline_ng_source_set") {
}
if (defined(config.enable_rosen_backend) && config.enable_rosen_backend) {
if (is_cross_platform_build) {
if (is_arkui_x) {
deps += [ "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client_static" ]
} else {
external_deps += [ "graphic_2d:librender_service_client" ]

View File

@ -29,7 +29,7 @@ foreach(module, common_napi_libs) {
ace_napi_lib(module) {
platform = "linux"
}
} else if (!is_cross_platform_build) {
} else if (!is_arkui_x) {
ace_napi_lib(module) {
# napi libs remain isolate in libace.z.so and asan version
if (is_asan) {

View File

@ -34,7 +34,7 @@ template("napi_animator_static") {
deps = []
external_deps = []
if (platform != "" && is_cross_platform_build) {
if (platform != "" && is_arkui_x) {
deps += [ "//plugins/libs/napi:napi_$platform" ]
} else {
external_deps += [ "napi:ace_napi" ]

View File

@ -34,7 +34,7 @@ template("napi_atomic_service_bar_static") {
deps = []
external_deps = []
if (platform != "" && is_cross_platform_build) {
if (platform != "" && is_arkui_x) {
deps += [ "$crossplatform_plugin_root/libs/napi:napi_$platform" ]
} else {
external_deps += [ "napi:ace_napi" ]

View File

@ -38,13 +38,13 @@ template("napi_componentsnapshot_static") {
deps += [ config.libace_target ]
}
if (platform != "" && is_cross_platform_build) {
if (platform != "" && is_arkui_x) {
deps += [ "//plugins/libs/napi:napi_$platform" ]
} else {
external_deps += [ "napi:ace_napi" ]
}
if (is_cross_platform_build) {
if (is_arkui_x) {
if (defined(config.pixel_map_support) && config.pixel_map_support) {
configs = [ "//foundation/multimedia/image_framework/interfaces/innerkits:image_external_config" ]
}

View File

@ -37,7 +37,7 @@ template("napi_componentutils_static") {
sources += [ "$ace_root/frameworks/base/geometry/matrix4.cpp" ]
}
deps = []
if (platform != "" && is_cross_platform_build) {
if (platform != "" && is_arkui_x) {
deps += [ "${crossplatform_plugin_root}/libs/napi:napi_$platform" ]
} else {
external_deps = [ "napi:ace_napi" ]

View File

@ -31,7 +31,7 @@ template("napi_configuration_static") {
deps = []
external_deps = []
if (platform != "" && is_cross_platform_build) {
if (platform != "" && is_arkui_x) {
deps += [ "//plugins/libs/napi:napi_$platform" ]
} else {
external_deps += [ "napi:ace_napi" ]

View File

@ -35,7 +35,7 @@ template("napi_device_static") {
deps = []
external_deps = []
if (platform != "" && is_cross_platform_build) {
if (platform != "" && is_arkui_x) {
deps += [ "//plugins/libs/napi:napi_$platform" ]
} else {
external_deps += [ "napi:ace_napi" ]

View File

@ -42,7 +42,7 @@ template("napi_dragcontroller_static") {
deps += [ config.libace_target ]
}
if (platform != "" && is_cross_platform_build) {
if (platform != "" && is_arkui_x) {
deps += [ "$crossplatform_plugin_root/libs/napi:napi_$platform" ]
} else {
external_deps += [
@ -51,7 +51,7 @@ template("napi_dragcontroller_static") {
]
}
if (is_cross_platform_build) {
if (is_arkui_x) {
if (defined(config.pixel_map_support) && config.pixel_map_support) {
configs = [ "$crossplatform_multimedia_root/image_framework/interfaces/innerkits:image_external_config" ]
}
@ -64,7 +64,7 @@ template("napi_dragcontroller_static") {
}
}
if (!is_cross_platform_build && defined(config.enable_drag_framework) &&
if (!is_arkui_x && defined(config.enable_drag_framework) &&
config.enable_drag_framework) {
external_deps += [
"device_status:devicestatus_client",

View File

@ -39,7 +39,7 @@ template("napi_font_static") {
deps = []
external_deps = []
if (platform != "" && is_cross_platform_build) {
if (platform != "" && is_arkui_x) {
deps += [ "//plugins/libs/napi:napi_$platform" ]
} else {
external_deps += [ "napi:ace_napi" ]

View File

@ -34,7 +34,7 @@ template("napi_grid_static") {
deps = []
external_deps = []
if (platform != "" && is_cross_platform_build) {
if (platform != "" && is_arkui_x) {
deps += [ "//plugins/libs/napi:napi_$platform" ]
} else {
external_deps += [ "napi:ace_napi" ]

View File

@ -34,7 +34,7 @@ template("napi_inspector_static") {
deps = []
external_deps = []
if (platform != "" && is_cross_platform_build) {
if (platform != "" && is_arkui_x) {
deps += [ "$crossplatform_plugin_root/libs/napi:napi_$platform" ]
} else {
external_deps = [ "napi:ace_napi" ]

View File

@ -35,7 +35,7 @@ template("napi_measure_static") {
deps = []
external_deps = []
if (platform != "" && is_cross_platform_build) {
if (platform != "" && is_arkui_x) {
deps += [ "//plugins/libs/napi:napi_$platform" ]
} else {
external_deps += [ "napi:ace_napi" ]

View File

@ -35,7 +35,7 @@ template("napi_mediaquery_static") {
deps = []
external_deps = []
if (platform != "" && is_cross_platform_build) {
if (platform != "" && is_arkui_x) {
deps += [ "//plugins/libs/napi:napi_$platform" ]
} else {
external_deps += [ "napi:ace_napi" ]

View File

@ -33,7 +33,7 @@ common_napi_libs = [
"atomic_service_bar",
]
if (!is_cross_platform_build) {
if (!is_arkui_x) {
common_napi_libs += [ "arkui/performancemonitor" ]
}

View File

@ -38,7 +38,7 @@ template("napi_prompt_static") {
deps = []
external_deps = []
if (platform != "" && is_cross_platform_build) {
if (platform != "" && is_arkui_x) {
deps += [ "//plugins/libs/napi:napi_$platform" ]
} else {
external_deps += [ "napi:ace_napi" ]

View File

@ -38,7 +38,7 @@ template("napi_promptaction_static") {
deps = []
external_deps = []
if (platform != "" && is_cross_platform_build) {
if (platform != "" && is_arkui_x) {
deps += [ "//plugins/libs/napi:napi_$platform" ]
} else {
external_deps += [ "napi:ace_napi" ]

View File

@ -35,7 +35,7 @@ template("napi_router_static") {
deps = []
external_deps = []
if (platform != "" && is_cross_platform_build) {
if (platform != "" && is_arkui_x) {
deps += [ "//plugins/libs/napi:napi_$platform" ]
} else {
external_deps += [ "napi:ace_napi" ]

View File

@ -35,7 +35,7 @@ template("napi_utils_static") {
deps = []
external_deps = []
if (platform != "" && is_cross_platform_build) {
if (platform != "" && is_arkui_x) {
deps += [ "//plugins/libs/napi:napi_$platform" ]
} else {
external_deps += [ "napi:ace_napi" ]

View File

@ -14,7 +14,7 @@
import("//build/ohos.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (!is_cross_platform_build) {
if (!is_arkui_x) {
ohos_ndk_headers("ace_header") {
dest_dir = "$ndk_headers_out_dir/ace/xcomponent/"
sources = [