From a88841d292ba0398bf1e68fe7ae08a23e8fa234b Mon Sep 17 00:00:00 2001 From: quguiren Date: Sat, 4 Nov 2023 15:39:38 +0800 Subject: [PATCH] Compile macro rectification Signed-off-by: quguiren --- tooling/BUILD.gn | 8 ++++---- websocket/BUILD.gn | 2 +- websocket/test/BUILD.gn | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tooling/BUILD.gn b/tooling/BUILD.gn index 306ddc39..f96e27d8 100644 --- a/tooling/BUILD.gn +++ b/tooling/BUILD.gn @@ -81,7 +81,7 @@ ohos_source_set("libark_ecma_debugger_set") { deps = [] - if (is_cross_platform_build && target_os == "ios") { + if (is_arkui_x && target_os == "ios") { deps += [ "$ark_third_party_root/cJSON:cjson_static" ] } else { deps += [ "$ark_third_party_root/cJSON:cjson" ] @@ -89,7 +89,7 @@ ohos_source_set("libark_ecma_debugger_set") { # hiviewdfx libraries external_deps = hiviewdfx_ext_deps - if (!is_cross_platform_build) { + if (!is_arkui_x) { external_deps += [ "runtime_core:libarkfile_static" ] } else { deps += [ "$ark_root/libpandafile:libarkfile_static" ] @@ -124,7 +124,7 @@ ohos_shared_library("libark_ecma_debugger") { # hiviewdfx libraries external_deps = hiviewdfx_ext_deps - if (!is_cross_platform_build) { + if (!is_arkui_x) { external_deps += [ "ets_runtime:libark_jsruntime" ] } else { deps += [ "../../ets_runtime:libark_jsruntime" ] @@ -152,7 +152,7 @@ ohos_shared_library("libark_ecma_debugger_test") { deps = [ "$ark_third_party_root/libuv:uv" ] - if (is_cross_platform_build && target_os == "ios") { + if (is_arkui_x && target_os == "ios") { deps += [ "$ark_third_party_root/cJSON:cjson_static" ] } else { deps += [ "$ark_third_party_root/cJSON:cjson" ] diff --git a/websocket/BUILD.gn b/websocket/BUILD.gn index 8c1a797c..50b7156c 100644 --- a/websocket/BUILD.gn +++ b/websocket/BUILD.gn @@ -119,7 +119,7 @@ ohos_source_set("websocket") { sources = [ "websocket.cpp" ] deps += [ sdk_libc_secshared_dep ] - if (is_cross_platform_build && target_os == "ios") { + if (is_arkui_x && target_os == "ios") { deps += [ "$ark_third_party_root/openssl:libcrypto_static" ] } else if (is_mingw) { deps += [ "$ark_third_party_root/openssl:libcrypto_restool" ] diff --git a/websocket/test/BUILD.gn b/websocket/test/BUILD.gn index d777162b..db649130 100644 --- a/websocket/test/BUILD.gn +++ b/websocket/test/BUILD.gn @@ -37,7 +37,7 @@ host_unittest_action("WebSocketTest") { sdk_libc_secshared_dep, ] - if (is_cross_platform_build && target_os == "ios") { + if (is_arkui_x && target_os == "ios") { deps += [ "$ark_third_party_root/openssl:libcrypto_static" ] } else { deps += [ "$ark_third_party_root/openssl:libcrypto_shared" ] -- Gitee