From fd2f4f950f9cdf6e9dcd50340a7a22362afc011e Mon Sep 17 00:00:00 2001 From: panzhenyu1 Date: Wed, 30 Nov 2022 15:50:48 +0800 Subject: [PATCH] Cherry pick PR76, fix compilation issue on Arkui-X Issue:https://gitee.com/openharmony/arkcompiler_toolchain/issues/I63XDO Signed-off-by: panzhenyu1 --- BUILD.gn | 2 +- test/fuzztest/dispatchprotocolmessage_fuzzer/BUILD.gn | 1 + test/fuzztest/initializedebugger_fuzzer/BUILD.gn | 1 + tooling/BUILD.gn | 5 +++-- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index dc49db9c..b8f2518f 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -30,7 +30,7 @@ config("ark_toolchain_common_config") { "-fasynchronous-unwind-tables", "-Wformat=2", ] - include_dirs = [ "//third_party/libuv/include" ] + if (is_linux) { defines += [ "PANDA_TARGET_UNIX", diff --git a/test/fuzztest/dispatchprotocolmessage_fuzzer/BUILD.gn b/test/fuzztest/dispatchprotocolmessage_fuzzer/BUILD.gn index a1a6254e..6e7a6043 100644 --- a/test/fuzztest/dispatchprotocolmessage_fuzzer/BUILD.gn +++ b/test/fuzztest/dispatchprotocolmessage_fuzzer/BUILD.gn @@ -33,6 +33,7 @@ ohos_fuzztest("DispatchProtocolMessageFuzzTest") { "//arkcompiler/ets_runtime:libark_jsruntime", "//arkcompiler/toolchain/tooling:libark_ecma_debugger_set", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", + "//third_party/libuv:uv", sdk_libc_secshared_dep, ] } diff --git a/test/fuzztest/initializedebugger_fuzzer/BUILD.gn b/test/fuzztest/initializedebugger_fuzzer/BUILD.gn index cfde7f60..53e1683c 100644 --- a/test/fuzztest/initializedebugger_fuzzer/BUILD.gn +++ b/test/fuzztest/initializedebugger_fuzzer/BUILD.gn @@ -33,6 +33,7 @@ ohos_fuzztest("InitializeDebuggerFuzzTest") { "//arkcompiler/ets_runtime:libark_jsruntime", "//arkcompiler/toolchain/tooling:libark_ecma_debugger_set", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", + "//third_party/libuv:uv", sdk_libc_secshared_dep, ] } diff --git a/tooling/BUILD.gn b/tooling/BUILD.gn index d779f558..b9402222 100644 --- a/tooling/BUILD.gn +++ b/tooling/BUILD.gn @@ -24,6 +24,9 @@ config("ark_ecma_debugger_config") { ".", "//third_party/cJSON", ] + if (!is_mingw && !is_mac && target_os != "ios") { + include_dirs += [ "//third_party/libuv/include" ] + } } debugger_sources = [ @@ -59,7 +62,6 @@ source_set("libark_ecma_debugger_set") { deps = [ "$ark_root/libpandafile:arkfile_header_deps", "//third_party/cJSON:cjson_static", - "//third_party/libuv:uv", ] if (is_mingw || is_mac) { @@ -137,7 +139,6 @@ source_set("libark_ecma_debugger_test_set") { deps = [ "$ark_root/libpandafile:arkfile_header_deps", "//third_party/cJSON:cjson_static", - "//third_party/libuv:uv", ] } -- Gitee