From 185cbcaa7497f09a54d34ea2206ccab7ceb31018 Mon Sep 17 00:00:00 2001 From: chengyuli Date: Tue, 12 Aug 2025 11:39:19 +0800 Subject: [PATCH] PREVIEW macro isolation https://gitee.com/openharmony/arkui_napi/issues/ICSIJF Signed-off-by: chengyuli Change-Id: I5964f7be63db55a7b6d1a3d73e31a239931dcc24 --- napi.gni | 8 +++++--- utils/data_protector.cpp | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/napi.gni b/napi.gni index 53990c937..77b1e39f4 100755 --- a/napi.gni +++ b/napi.gni @@ -13,8 +13,6 @@ napi_path = "//foundation//arkui/napi" ets_runtime_path = "//arkcompiler/ets_runtime" -# Set is enable data_protector -enabled_data_protector = false napi_sources = [ "callback_scope_manager/native_callback_scope_manager.cpp", @@ -62,9 +60,13 @@ declare_args() { # Set pgo profdata path napi_feature_pgo_path = "" + + # Set is enable data_protector + napi_enable_data_protector = false + enabled_data_protector = false } -if (defined(target_cpu) && target_cpu == "arm64" && +if (defined(target_cpu) && target_cpu == "arm64" && napi_enable_data_protector && !(defined(is_arkui_x) && is_arkui_x) && is_ohos && !is_emulator) { enabled_data_protector = true } diff --git a/utils/data_protector.cpp b/utils/data_protector.cpp index b5fb2570f..cc0ee653c 100644 --- a/utils/data_protector.cpp +++ b/utils/data_protector.cpp @@ -15,7 +15,7 @@ #include "data_protector.h" -#if defined(NAPI_ENABLE_DATA_PROTECT) +#if defined(NAPI_ENABLE_DATA_PROTECT) && !defined(PREVIEW) && !defined(SIMULATOR) #include #include -- Gitee