From f4a6ef694daad201f52a69a18263dc66a58b7fac Mon Sep 17 00:00:00 2001 From: chen Date: Thu, 21 Jul 2022 18:44:22 +0800 Subject: [PATCH] modify samgr Signed-off-by: chen Change-Id: Idbfdfed8642662f45a024276c0e71afcd55c8646 --- BUILD.gn | 1 - examples/distributedb/test/BUILD.gn | 4 ++-- third_party/lib/cpp/BUILD.gn | 20 +++++++------------- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 599b35d..93dfa9c 100755 --- a/BUILD.gn +++ b/BUILD.gn @@ -11,7 +11,6 @@ # See the License for the specific language governing permissions and # limitations under the License. - group("make_temp_test") { testonly = true deps = [] diff --git a/examples/distributedb/test/BUILD.gn b/examples/distributedb/test/BUILD.gn index 0bf3b10..9aafa82 100755 --- a/examples/distributedb/test/BUILD.gn +++ b/examples/distributedb/test/BUILD.gn @@ -47,7 +47,7 @@ ohos_distributedtest("DistributeDemo") { "hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] deps = [ @@ -69,7 +69,7 @@ ohos_distributedtest("DistributeDemoAgent") { "hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] deps = [ diff --git a/third_party/lib/cpp/BUILD.gn b/third_party/lib/cpp/BUILD.gn index 8898794..8c879ea 100755 --- a/third_party/lib/cpp/BUILD.gn +++ b/third_party/lib/cpp/BUILD.gn @@ -23,8 +23,8 @@ config("gtest_config") { static_library("gtest") { #testonly = true public = [ - "//third_party/googletest/googletest/include/gtest/gtest.h", "//third_party/googletest/googletest/include/gtest/gtest-spi.h", + "//third_party/googletest/googletest/include/gtest/gtest.h", ] sources = [ "//third_party/googletest/googletest/include/gtest/gtest-death-test.h", @@ -35,6 +35,10 @@ static_library("gtest") { "//third_party/googletest/googletest/include/gtest/gtest-typed-test.h", "//third_party/googletest/googletest/include/gtest/gtest_pred_impl.h", "//third_party/googletest/googletest/include/gtest/gtest_prod.h", + "//third_party/googletest/googletest/include/gtest/hwext/gtest-ext.h", + "//third_party/googletest/googletest/include/gtest/hwext/gtest-filter.h", + "//third_party/googletest/googletest/include/gtest/hwext/gtest-tag.h", + "//third_party/googletest/googletest/include/gtest/hwext/utils.h", "//third_party/googletest/googletest/include/gtest/internal/custom/gtest-port.h", "//third_party/googletest/googletest/include/gtest/internal/custom/gtest-printers.h", "//third_party/googletest/googletest/include/gtest/internal/custom/gtest.h", @@ -49,10 +53,6 @@ static_library("gtest") { "//third_party/googletest/googletest/include/gtest/internal/gtest-string.h", "//third_party/googletest/googletest/include/gtest/internal/gtest-tuple.h", "//third_party/googletest/googletest/include/gtest/internal/gtest-type-util.h", - "//third_party/googletest/googletest/include/gtest/hwext/gtest-ext.h", - "//third_party/googletest/googletest/include/gtest/hwext/gtest-filter.h", - "//third_party/googletest/googletest/include/gtest/hwext/gtest-tag.h", - "//third_party/googletest/googletest/include/gtest/hwext/utils.h", "//third_party/googletest/googletest/src/gtest-death-test.cc", "//third_party/googletest/googletest/src/gtest-filepath.cc", "//third_party/googletest/googletest/src/gtest-internal-inl.h", @@ -73,12 +73,6 @@ static_library("gtest") { static_library("gtest_main") { #testonly = true - sources = [ - "//third_party/googletest/googletest/src/gtest_main.cc", - ] - public_deps = [ - ":gtest", - ] + sources = [ "//third_party/googletest/googletest/src/gtest_main.cc" ] + public_deps = [ ":gtest" ] } - - -- Gitee