diff --git a/base/BUILD.gn b/base/BUILD.gn index f3539230f83d2d614180164151447708704c9195..fc446502557478c94e768c1d5d14c874799795c9 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -178,7 +178,7 @@ ohos_shared_library("utils") { ########## modules for `c_utils` in rust ########## # rust compiler is not supportted on mac -if (host_os != "mac") { +if (host_os == "linux" && !is_asan) { import("//build/templates/rust/rust_cxx.gni") # used for templates rust_cxx() rust_cxx("cxx_rust_gen") { sources = [ @@ -212,7 +212,7 @@ if (host_os != "mac") { part_name = "c_utils" } - ohos_rust_shared_library("utils_rust") { + ohos_rust_shared_library("utils_rs") { sources = [ "src/rust/ashmem.rs", "src/rust/directory_ex.rs", @@ -236,4 +236,11 @@ if (host_os != "mac") { ] } } + +group("utils_rust") { + public_deps = [] + if (host_os == "linux" && !is_asan) { + public_deps += [ ":utils_rs" ] + } +} ############################################################################### diff --git a/base/test/BUILD.gn b/base/test/BUILD.gn index d053aeb93fc3f3e77f418b7ff12884f3828a3f7e..c44dea18ff9f1bed0e68e7d1d61565e0adcec368 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 != "mac") { + if (host_os == "linux" && !is_asan) { deps += [ "unittest/rust:unittest" ] } } diff --git a/base/test/unittest/rust/BUILD.gn b/base/test/unittest/rust/BUILD.gn index 723fa086ced47787e7641f588b86d912efd66f56..0988f339140b96cbd0fb6dc4f415bd39e2483b22 100644 --- a/base/test/unittest/rust/BUILD.gn +++ b/base/test/unittest/rust/BUILD.gn @@ -13,45 +13,47 @@ import("//build/ohos.gni") import("//build/test.gni") -config("module_private_config") { - visibility = [ ":*" ] +if (host_os == "linux" && !is_asan) { + config("module_private_config") { + visibility = [ ":*" ] - # library path - lib_dirs = [ "libs" ] -} + # library path + lib_dirs = [ "libs" ] + } -group("unittest") { - testonly = true - deps = [] + group("unittest") { + testonly = true + deps = [] - deps += [ - ":utils_rust_ashmem_test", - ":utils_rust_directory_test", - ":utils_rust_file_test", - ] -} + deps += [ + ":utils_rust_ashmem_test", + ":utils_rust_directory_test", + ":utils_rust_file_test", + ] + } -ohos_rust_unittest("utils_rust_ashmem_test") { - module_out_path = "utils/base/rust" - sources = [ "utils_rust_ashmem_test.rs" ] - configs = [ ":module_private_config" ] - deps = [ "../../../../base:utils_rust" ] -} + ohos_rust_unittest("utils_rust_ashmem_test") { + module_out_path = "utils/base/rust" + sources = [ "utils_rust_ashmem_test.rs" ] + configs = [ ":module_private_config" ] + deps = [ "../../../../base:utils_rust" ] + } -ohos_rust_unittest("utils_rust_file_test") { - module_out_path = "utils/base/rust" - sources = [ "utils_rust_file_test.rs" ] - deps = [ - "//commonlibrary/c_utils/base:utils_rust", - "//third_party/rust/crates/cxx:lib", - ] -} + ohos_rust_unittest("utils_rust_file_test") { + module_out_path = "utils/base/rust" + sources = [ "utils_rust_file_test.rs" ] + deps = [ + "//commonlibrary/c_utils/base:utils_rust", + "//third_party/rust/crates/cxx:lib", + ] + } -ohos_rust_unittest("utils_rust_directory_test") { - module_out_path = "utils/base/rust" - sources = [ "utils_rust_directory_test.rs" ] - deps = [ - "//commonlibrary/c_utils/base:utils_rust", - "//third_party/rust/crates/cxx:lib", - ] + ohos_rust_unittest("utils_rust_directory_test") { + module_out_path = "utils/base/rust" + sources = [ "utils_rust_directory_test.rs" ] + deps = [ + "//commonlibrary/c_utils/base:utils_rust", + "//third_party/rust/crates/cxx:lib", + ] + } }