From 79f0b2cd76a6304186d6d1cf94361f5ce12cf04c Mon Sep 17 00:00:00 2001 From: liujialiang Date: Mon, 12 Jun 2023 19:14:52 +0800 Subject: [PATCH] Exclude rust module on mac Mac is still not surpportted rust. So we exclude it. Signed-off-by: liujialiang Change-Id: Iae678f7d64c211b540b3429fc9f9e928d9784435 --- base/BUILD.gn | 105 +++++++++++++++++++++++---------------------- base/test/BUILD.gn | 12 ++---- 2 files changed, 58 insertions(+), 59 deletions(-) diff --git a/base/BUILD.gn b/base/BUILD.gn index e4ae351..f353923 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -11,7 +11,6 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -import("//build/templates/rust/rust_cxx.gni") # used for templates rust_cxx() ############################################################################### declare_args() { @@ -178,59 +177,63 @@ ohos_shared_library("utils") { } ########## modules for `c_utils` in rust ########## -rust_cxx("cxx_rust_gen") { - sources = [ - "src/rust/ashmem.rs", - "src/rust/directory_ex.rs", - "src/rust/file_ex.rs", - ] -} +# rust compiler is not supportted on mac +if (host_os != "mac") { + import("//build/templates/rust/rust_cxx.gni") # used for templates rust_cxx() + rust_cxx("cxx_rust_gen") { + sources = [ + "src/rust/ashmem.rs", + "src/rust/directory_ex.rs", + "src/rust/file_ex.rs", + ] + } -ohos_static_library("utils_static_cxx_rust") { - sources = [ - "src/ashmem.cpp", - "src/directory_ex.cpp", - "src/file_ex.cpp", - "src/refbase.cpp", - ] - sources += get_target_outputs(":cxx_rust_gen") - defines = [ "UTILS_CXX_RUST" ] - include_dirs = [ - "include", - "${target_gen_dir}", - "//third_party/rust/crates/cxx/include", - ] - deps = [ - ":cxx_rust_gen", - "//build/rust/tests:cxx_cppdeps", - ] - public_deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + ohos_static_library("utils_static_cxx_rust") { + sources = [ + "src/ashmem.cpp", + "src/directory_ex.cpp", + "src/file_ex.cpp", + "src/refbase.cpp", + ] + sources += get_target_outputs(":cxx_rust_gen") + defines = [ "UTILS_CXX_RUST" ] + include_dirs = [ + "include", + "${target_gen_dir}", + "//third_party/rust/crates/cxx/include", + ] + deps = [ + ":cxx_rust_gen", + "//build/rust/tests:cxx_cppdeps", + ] + public_deps = [ "//third_party/bounds_checking_function:libsec_shared" ] - subsystem_name = "commonlibrary" - part_name = "c_utils" -} + subsystem_name = "commonlibrary" + part_name = "c_utils" + } -ohos_rust_shared_library("utils_rust") { - sources = [ - "src/rust/ashmem.rs", - "src/rust/directory_ex.rs", - "src/rust/file_ex.rs", - "src/rust/lib.rs", - ] - deps = [ - ":utils_static_cxx_rust", - "//third_party/rust/crates/cxx:lib", - ] + ohos_rust_shared_library("utils_rust") { + sources = [ + "src/rust/ashmem.rs", + "src/rust/directory_ex.rs", + "src/rust/file_ex.rs", + "src/rust/lib.rs", + ] + deps = [ + ":utils_static_cxx_rust", + "//third_party/rust/crates/cxx:lib", + ] - crate_root = "src/rust/lib.rs" - crate_name = "utils_rust" - crate_type = "dylib" - output_extension = "dylib.so" - subsystem_name = "commonlibrary" - part_name = "c_utils" - install_images = [ - "system", - "updater", - ] + crate_root = "src/rust/lib.rs" + crate_name = "utils_rust" + crate_type = "dylib" + output_extension = "dylib.so" + subsystem_name = "commonlibrary" + part_name = "c_utils" + install_images = [ + "system", + "updater", + ] + } } ############################################################################### diff --git a/base/test/BUILD.gn b/base/test/BUILD.gn index fa78f6d..d053aeb 100644 --- a/base/test/BUILD.gn +++ b/base/test/BUILD.gn @@ -17,15 +17,11 @@ group("unittest") { testonly = true deps = [] - deps += [ - "unittest/common:unittest", - "unittest/rust:unittest", - ] + deps += [ "unittest/common:unittest" ] - if (is_phone_product) { - deps += [ - # "unittest/phone:unittest", - ] + # rust compiler is not supportted on mac + if (host_os != "mac") { + deps += [ "unittest/rust:unittest" ] } } ############################################################################### -- Gitee