From 396a780e3a4136e7e734aee75dd2d92d13a135c1 Mon Sep 17 00:00:00 2001 From: quguiren Date: Fri, 3 Nov 2023 16:55:34 +0800 Subject: [PATCH] Compile macro rectification Signed-off-by: quguiren --- es2panda/BUILD.gn | 2 +- ets_frontend_config.gni | 3 --- merge_abc/BUILD.gn | 4 ++-- ts2panda/ts2abc/BUILD.gn | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/es2panda/BUILD.gn b/es2panda/BUILD.gn index 935925f844..1fe5c611b7 100644 --- a/es2panda/BUILD.gn +++ b/es2panda/BUILD.gn @@ -407,7 +407,7 @@ ohos_static_library("es2panda_lib") { ] external_deps = [] - if (!is_cross_platform_build) { + if (!is_arkui_x) { external_deps += [ "runtime_core:libarkassembler_frontend_static", "runtime_core:libarkbase_frontend_static", diff --git a/ets_frontend_config.gni b/ets_frontend_config.gni index 499f491e46..2aa02739e7 100644 --- a/ets_frontend_config.gni +++ b/ets_frontend_config.gni @@ -15,9 +15,6 @@ if (!defined(ark_standalone_build)) { ark_standalone_build = false } -is_cross_platform_build = - defined(build_cross_platform_version) && build_cross_platform_version - if (!ark_standalone_build) { build_root = "//build" ark_third_party_root = "//third_party" diff --git a/merge_abc/BUILD.gn b/merge_abc/BUILD.gn index 76f2f74178..93571775d5 100644 --- a/merge_abc/BUILD.gn +++ b/merge_abc/BUILD.gn @@ -149,7 +149,7 @@ ohos_source_set("assembly_proto_static") { ] external_deps = [] - if (!is_cross_platform_build) { + if (!is_arkui_x) { external_deps += [ "runtime_core:libarkassembler_frontend_static", "runtime_core:libarkbase_frontend_static", @@ -204,7 +204,7 @@ ohos_executable("merge_abc") { "../es2panda:es2panda_lib", ] - if (!is_cross_platform_build) { + if (!is_arkui_x) { external_deps = [ "runtime_core:libarkziparchive_frontend_static" ] } else { deps += [ "$ark_root/libziparchive:libarkziparchive_frontend_static" ] diff --git a/ts2panda/ts2abc/BUILD.gn b/ts2panda/ts2abc/BUILD.gn index 5f9c519667..7badb060e6 100755 --- a/ts2panda/ts2abc/BUILD.gn +++ b/ts2panda/ts2abc/BUILD.gn @@ -93,7 +93,7 @@ ohos_executable("ts2abc") { if (is_linux || is_mingw || is_mac) { deps += [ "$ark_third_party_root/jsoncpp:jsoncpp_static" ] - if (!is_cross_platform_build) { + if (!is_arkui_x) { external_deps += [ "runtime_core:libarkassembler_frontend_static", "runtime_core:libarkbase_frontend_static", -- Gitee