From fa067463108f0f04694be1703063c1737c1e41d2 Mon Sep 17 00:00:00 2001 From: yang1946 Date: Mon, 4 Dec 2023 11:30:53 +0800 Subject: [PATCH] =?UTF-8?q?bundle.json=E5=88=A0=E9=99=A4googletest?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yang1946 --- bundle.json | 4 +--- code_signature.gni | 1 - test/unittest/BUILD.gn | 7 ------- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/bundle.json b/bundle.json index 8ca502b..5f55c27 100644 --- a/bundle.json +++ b/bundle.json @@ -32,7 +32,6 @@ "safwk", "huks", "eventhandler", - "build_framework", "access_token", "ylong_json", "appverify", @@ -40,8 +39,7 @@ ], "third_party": [ "openssl", - "fsverity-utils", - "googletest" + "fsverity-utils" ] }, "build": { diff --git a/code_signature.gni b/code_signature.gni index 7698acf..31bd92a 100644 --- a/code_signature.gni +++ b/code_signature.gni @@ -16,7 +16,6 @@ code_signature_root_dir = "//base/security/code_signature" fsverity_utils_dir = "//third_party/fsverity-utils" openssl_dir = "//third_party/openssl" rust_openssl_dir = "//third_party/rust/crates/rust-openssl" -googletest_dir = "//third_party/googletest" third_party_securec_dir = "//third_party/bounds_checking_function" declare_args() { diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index dd1bb28..63b64af 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -38,8 +38,6 @@ ohos_source_set("key_enable_src_set") { ohos_unittest("add_cert_path_unittest") { module_out_path = "security/code_signature" sources = [ "add_cert_path_test.cpp" ] - - deps = [ "${googletest_dir}:gtest" ] } ohos_unittest("code_sign_utils_unittest") { @@ -50,7 +48,6 @@ ohos_unittest("code_sign_utils_unittest") { deps = [ ":key_enable_src_set", "${code_signature_root_dir}/interfaces/innerkits/code_sign_utils:libcode_sign_utils", - "${googletest_dir}:gtest", ] include_dirs = [ @@ -73,7 +70,6 @@ ohos_unittest("local_code_sign_unittest") { deps = [ "${code_signature_root_dir}/interfaces/innerkits/code_sign_utils:libcode_sign_utils", "${code_signature_root_dir}/interfaces/innerkits/local_code_sign:liblocal_code_sign_sdk", - "${googletest_dir}:gtest", "${openssl_dir}:libcrypto_shared", ] @@ -103,7 +99,6 @@ ohos_unittest("sign_and_enforce_unittest") { deps = [ "${code_signature_root_dir}/interfaces/innerkits/code_sign_utils:libcode_sign_utils", "${code_signature_root_dir}/interfaces/innerkits/local_code_sign:liblocal_code_sign_sdk", - "${googletest_dir}:gtest", "${openssl_dir}:libcrypto_shared", ] @@ -133,7 +128,6 @@ ohos_unittest("multi_thread_local_sign_unittest") { deps = [ "${code_signature_root_dir}/interfaces/innerkits/code_sign_utils:libcode_sign_utils", "${code_signature_root_dir}/interfaces/innerkits/local_code_sign:liblocal_code_sign_sdk", - "${googletest_dir}:gtest", "${openssl_dir}:libcrypto_shared", ] @@ -206,7 +200,6 @@ ohos_unittest("enable_verity_ioctl_unittest") { deps = [ ":key_enable_src_set", "${code_signature_root_dir}/interfaces/innerkits/code_sign_attr_utils:libcode_sign_attr_utils", - "${googletest_dir}:gtest", ] external_deps = [ "c_utils:utils", -- Gitee