From 2e024b0d5770ea61294ac1f76c931b90adf257d6 Mon Sep 17 00:00:00 2001 From: Petrov Igor Date: Thu, 19 Dec 2024 10:43:27 +0300 Subject: [PATCH] [Build] Set hybrid build as default Issue: https://gitee.com/openharmony/arkcompiler_runtime_core/issues/IBCEZI Testing: `CI` Signed-off-by: Petrov Igor --- BUILD.gn | 2 +- ecmascript/pgo_profiler/prof_dump/BUILD.gn | 3 +++ js_runtime_config.gni | 2 +- libark_jsruntime.map | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index f46d4b3b3f..6e41a03c8c 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -232,7 +232,7 @@ config("ark_jsruntime_public_config") { if (ark_js_hybrid) { defines += [ "PANDA_JS_ETS_HYBRID_MODE" ] - include_dirs += [ "$arkplatform_root" ] + configs += [ "$ark_root/arkplatform:arkplatform_public_config" ] } } diff --git a/ecmascript/pgo_profiler/prof_dump/BUILD.gn b/ecmascript/pgo_profiler/prof_dump/BUILD.gn index 6fdfbd2f48..2e2077bd4a 100644 --- a/ecmascript/pgo_profiler/prof_dump/BUILD.gn +++ b/ecmascript/pgo_profiler/prof_dump/BUILD.gn @@ -32,6 +32,9 @@ ohos_executable("profdump") { "runtime_core:libarkfile_static", "zlib:libz", ] + if (ark_js_hybrid) { + external_deps += [ "runtime_core:libarkplatform" ] + } configs = [ "$js_root:ark_jsruntime_common_config", diff --git a/js_runtime_config.gni b/js_runtime_config.gni index 10563588ef..df13ff2335 100644 --- a/js_runtime_config.gni +++ b/js_runtime_config.gni @@ -50,7 +50,7 @@ declare_args() { ets_runtime_feature_enable_list = false enable_gc_dfx_options = false - ark_js_hybrid = false + ark_js_hybrid = !ark_standalone_build } if (target_cpu == "arm64") { diff --git a/libark_jsruntime.map b/libark_jsruntime.map index a840014688..2953227e01 100644 --- a/libark_jsruntime.map +++ b/libark_jsruntime.map @@ -76,6 +76,7 @@ panda::Uint8ClampedArrayRef::*; panda::WeakMapRef::*; panda::WeakSetRef::*; + panda::HandshakeHelper::*; panda::TryCatch::*; panda::JSNApi::*; -- Gitee