From 24836f19b539a64a6ac4d7dd08eceb1663995590 Mon Sep 17 00:00:00 2001 From: quguiren Date: Fri, 3 Nov 2023 10:03:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8F=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: quguiren --- base/BUILD.gn | 6 +++--- base/test/BUILD.gn | 2 +- base/test/unittest/rust/BUILD.gn | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/base/BUILD.gn b/base/BUILD.gn index fb3a04c..447d1df 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -157,7 +157,7 @@ ohos_shared_library("utils") { sources = sources_utils configs = [ ":utils_coverage_config" ] - if (!build_cross_platform_version) { + if (!is_arkui_x) { if (c_utils_feature_intsan) { sanitize = { integer_overflow = true @@ -198,7 +198,7 @@ ohos_shared_library("utils") { ########## modules for `c_utils` in rust ########## # rust compiler is not supportted on mac -if (host_os == "linux" && !is_asan && !build_cross_platform_version) { +if (host_os == "linux" && !is_asan && !is_arkui_x) { import("//build/templates/rust/rust_cxx.gni") # used for templates rust_cxx() rust_cxx("cxx_rust_gen") { sources = [ @@ -259,7 +259,7 @@ if (host_os == "linux" && !is_asan && !build_cross_platform_version) { group("utils_rust") { public_deps = [] - if (host_os == "linux" && !is_asan && !build_cross_platform_version) { + if (host_os == "linux" && !is_asan && !is_arkui_x) { public_deps += [ ":utils_rs" ] } } diff --git a/base/test/BUILD.gn b/base/test/BUILD.gn index 2368aac..705d895 100644 --- a/base/test/BUILD.gn +++ b/base/test/BUILD.gn @@ -20,7 +20,7 @@ group("unittest") { deps += [ "unittest/common:unittest" ] # rust compiler is not supportted on mac - if (host_os == "linux" && !is_asan && !build_cross_platform_version) { + if (host_os == "linux" && !is_asan && !is_arkui_x) { deps += [ "unittest/rust:unittest" ] } } diff --git a/base/test/unittest/rust/BUILD.gn b/base/test/unittest/rust/BUILD.gn index 8353fcd..a2fe771 100644 --- a/base/test/unittest/rust/BUILD.gn +++ b/base/test/unittest/rust/BUILD.gn @@ -13,7 +13,7 @@ import("//build/ohos.gni") import("//build/test.gni") -if (host_os == "linux" && !is_asan && !build_cross_platform_version) { +if (host_os == "linux" && !is_asan && !is_arkui_x) { config("module_private_config") { visibility = [ ":*" ] -- Gitee