From 2a91d4a94395972ebadde23c92d37ddee3047f95 Mon Sep 17 00:00:00 2001 From: wujianlin Date: Wed, 10 Jul 2024 14:30:42 +0800 Subject: [PATCH] Disable absolute path dependence Issue:https://gitee.com/openharmony/commonlibrary_c_utils/issues/IABXS3?from=project-issue Signed-off-by: wujianlin --- base/test/benchmarktest/ashemem_benchmark_test/BUILD.gn | 3 +-- base/test/benchmarktest/datatime_benchmark_test/BUILD.gn | 3 +-- base/test/benchmarktest/directory_benchmark_test/BUILD.gn | 3 +-- base/test/benchmarktest/event_benchmark_test/BUILD.gn | 3 +-- base/test/benchmarktest/file_benchmark_test/BUILD.gn | 3 +-- base/test/benchmarktest/mapped_benchmark_test/BUILD.gn | 3 +-- base/test/benchmarktest/observer_benchmark_test/BUILD.gn | 3 +-- base/test/benchmarktest/parcel_benchmark_test/BUILD.gn | 3 +-- base/test/benchmarktest/refbase_benchmark_test/BUILD.gn | 3 +-- base/test/benchmarktest/rwlock_benchmark_test/BUILD.gn | 3 +-- .../benchmarktest/safe_block_queue_benchmark_test/BUILD.gn | 3 +-- .../safe_block_queue_tracking_benchmark_test/BUILD.gn | 3 +-- base/test/benchmarktest/safe_map_benchmark_test/BUILD.gn | 3 +-- base/test/benchmarktest/safe_queue_benchmark_test/BUILD.gn | 3 +-- base/test/benchmarktest/singleton_benchmark_test/BUILD.gn | 3 +-- base/test/benchmarktest/sorted_vector_benchmark_test/BUILD.gn | 3 +-- base/test/benchmarktest/string_benchmark_test/BUILD.gn | 3 +-- base/test/benchmarktest/thread_benchmark_test/BUILD.gn | 3 +-- base/test/benchmarktest/thread_pool_benchmark_test/BUILD.gn | 3 +-- base/test/benchmarktest/timer_benchmark_test/BUILD.gn | 3 +-- base/test/benchmarktest/unique_fd_benchmark_test/BUILD.gn | 3 +-- bundle.json | 3 ++- 22 files changed, 23 insertions(+), 43 deletions(-) diff --git a/base/test/benchmarktest/ashemem_benchmark_test/BUILD.gn b/base/test/benchmarktest/ashemem_benchmark_test/BUILD.gn index 133bbd5..f0f9c3d 100644 --- a/base/test/benchmarktest/ashemem_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/ashemem_benchmark_test/BUILD.gn @@ -26,9 +26,8 @@ ohos_benchmarktest("AshememTest") { ] sources = [ "ashemem_benchmark_test.cpp" ] - deps = [ "//third_party/benchmark:benchmark" ] - external_deps = [ + "benchmark:benchmark", "c_utils:utils", "hilog:libhilog_base", ] diff --git a/base/test/benchmarktest/datatime_benchmark_test/BUILD.gn b/base/test/benchmarktest/datatime_benchmark_test/BUILD.gn index a0341d8..2738d7b 100644 --- a/base/test/benchmarktest/datatime_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/datatime_benchmark_test/BUILD.gn @@ -26,9 +26,8 @@ ohos_benchmarktest("DatatimeTest") { ] sources = [ "datatime_benchmark_test.cpp" ] - deps = [ "//third_party/benchmark:benchmark" ] - external_deps = [ + "benchmark:benchmark", "c_utils:utils", "hilog:libhilog_base", ] diff --git a/base/test/benchmarktest/directory_benchmark_test/BUILD.gn b/base/test/benchmarktest/directory_benchmark_test/BUILD.gn index 8e55741..d2ac71f 100644 --- a/base/test/benchmarktest/directory_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/directory_benchmark_test/BUILD.gn @@ -26,9 +26,8 @@ ohos_benchmarktest("DirectoryTest") { ] sources = [ "directory_benchmark_test.cpp" ] - deps = [ "//third_party/benchmark:benchmark" ] - external_deps = [ + "benchmark:benchmark", "c_utils:utils", "hilog:libhilog_base", ] diff --git a/base/test/benchmarktest/event_benchmark_test/BUILD.gn b/base/test/benchmarktest/event_benchmark_test/BUILD.gn index e3fa658..ade8e7f 100644 --- a/base/test/benchmarktest/event_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/event_benchmark_test/BUILD.gn @@ -28,9 +28,8 @@ ohos_benchmarktest("EventTest") { ] sources = [ "event_benchmark_test.cpp" ] - deps = [ "//third_party/benchmark:benchmark" ] - external_deps = [ + "benchmark:benchmark", "c_utils:utils", "hilog:libhilog_base", ] diff --git a/base/test/benchmarktest/file_benchmark_test/BUILD.gn b/base/test/benchmarktest/file_benchmark_test/BUILD.gn index 06474c4..a4879c6 100644 --- a/base/test/benchmarktest/file_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/file_benchmark_test/BUILD.gn @@ -26,9 +26,8 @@ ohos_benchmarktest("FileTest") { ] sources = [ "file_benchmark_test.cpp" ] - deps = [ "//third_party/benchmark:benchmark" ] - external_deps = [ + "benchmark:benchmark", "c_utils:utils", "hilog:libhilog_base", ] diff --git a/base/test/benchmarktest/mapped_benchmark_test/BUILD.gn b/base/test/benchmarktest/mapped_benchmark_test/BUILD.gn index 93d0054..f2198ed 100644 --- a/base/test/benchmarktest/mapped_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/mapped_benchmark_test/BUILD.gn @@ -26,9 +26,8 @@ ohos_benchmarktest("MappedTest") { ] sources = [ "mapped_benchmark_test.cpp" ] - deps = [ "//third_party/benchmark:benchmark" ] - external_deps = [ + "benchmark:benchmark", "c_utils:utils", "hilog:libhilog_base", ] diff --git a/base/test/benchmarktest/observer_benchmark_test/BUILD.gn b/base/test/benchmarktest/observer_benchmark_test/BUILD.gn index 91e0d5c..330e778 100644 --- a/base/test/benchmarktest/observer_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/observer_benchmark_test/BUILD.gn @@ -26,9 +26,8 @@ ohos_benchmarktest("ObserverTest") { ] sources = [ "observer_benchmark_test.cpp" ] - deps = [ "//third_party/benchmark:benchmark" ] - external_deps = [ + "benchmark:benchmark", "c_utils:utils", "hilog:libhilog_base", ] diff --git a/base/test/benchmarktest/parcel_benchmark_test/BUILD.gn b/base/test/benchmarktest/parcel_benchmark_test/BUILD.gn index e682790..460852d 100644 --- a/base/test/benchmarktest/parcel_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/parcel_benchmark_test/BUILD.gn @@ -26,9 +26,8 @@ ohos_benchmarktest("ParcelTest") { ] sources = [ "parcel_benchmark_test.cpp" ] - deps = [ "//third_party/benchmark:benchmark" ] - external_deps = [ + "benchmark:benchmark", "c_utils:utils", "hilog:libhilog_base", ] diff --git a/base/test/benchmarktest/refbase_benchmark_test/BUILD.gn b/base/test/benchmarktest/refbase_benchmark_test/BUILD.gn index bfd7675..fc5d971 100644 --- a/base/test/benchmarktest/refbase_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/refbase_benchmark_test/BUILD.gn @@ -26,9 +26,8 @@ ohos_benchmarktest("RefbaseTest") { ] sources = [ "refbase_benchmark_test.cpp" ] - deps = [ "//third_party/benchmark:benchmark" ] - external_deps = [ + "benchmark:benchmark", "c_utils:utils", "hilog:libhilog_base", ] diff --git a/base/test/benchmarktest/rwlock_benchmark_test/BUILD.gn b/base/test/benchmarktest/rwlock_benchmark_test/BUILD.gn index 3b90fa6..8a195b0 100644 --- a/base/test/benchmarktest/rwlock_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/rwlock_benchmark_test/BUILD.gn @@ -26,9 +26,8 @@ ohos_benchmarktest("RwlockTest") { ] sources = [ "rwlock_benchmark_test.cpp" ] - deps = [ "//third_party/benchmark:benchmark" ] - external_deps = [ + "benchmark:benchmark", "c_utils:utils", "hilog:libhilog_base", ] diff --git a/base/test/benchmarktest/safe_block_queue_benchmark_test/BUILD.gn b/base/test/benchmarktest/safe_block_queue_benchmark_test/BUILD.gn index d75b500..2ed1760 100644 --- a/base/test/benchmarktest/safe_block_queue_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/safe_block_queue_benchmark_test/BUILD.gn @@ -26,9 +26,8 @@ ohos_benchmarktest("SafeBlockQueueTest") { ] sources = [ "safe_block_queue_benchmark_test.cpp" ] - deps = [ "//third_party/benchmark:benchmark" ] - external_deps = [ + "benchmark:benchmark", "c_utils:utils", "hilog:libhilog_base", ] diff --git a/base/test/benchmarktest/safe_block_queue_tracking_benchmark_test/BUILD.gn b/base/test/benchmarktest/safe_block_queue_tracking_benchmark_test/BUILD.gn index a3348dc..2992fdb 100644 --- a/base/test/benchmarktest/safe_block_queue_tracking_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/safe_block_queue_tracking_benchmark_test/BUILD.gn @@ -26,9 +26,8 @@ ohos_benchmarktest("SafeBlockQueueTrackingTest") { ] sources = [ "safe_block_queue_tracking_benchmark_test.cpp" ] - deps = [ "//third_party/benchmark:benchmark" ] - external_deps = [ + "benchmark:benchmark", "c_utils:utils", "hilog:libhilog_base", ] diff --git a/base/test/benchmarktest/safe_map_benchmark_test/BUILD.gn b/base/test/benchmarktest/safe_map_benchmark_test/BUILD.gn index 813ca88..17022dd 100644 --- a/base/test/benchmarktest/safe_map_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/safe_map_benchmark_test/BUILD.gn @@ -26,9 +26,8 @@ ohos_benchmarktest("SafeMapTest") { ] sources = [ "safe_map_benchmark_test.cpp" ] - deps = [ "//third_party/benchmark:benchmark" ] - external_deps = [ + "benchmark:benchmark", "c_utils:utils", "hilog:libhilog_base", ] diff --git a/base/test/benchmarktest/safe_queue_benchmark_test/BUILD.gn b/base/test/benchmarktest/safe_queue_benchmark_test/BUILD.gn index 36927e9..0a6a1c0 100644 --- a/base/test/benchmarktest/safe_queue_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/safe_queue_benchmark_test/BUILD.gn @@ -26,9 +26,8 @@ ohos_benchmarktest("SafeQueueTest") { ] sources = [ "safe_queue_benchmark_test.cpp" ] - deps = [ "//third_party/benchmark:benchmark" ] - external_deps = [ + "benchmark:benchmark", "c_utils:utils", "hilog:libhilog_base", ] diff --git a/base/test/benchmarktest/singleton_benchmark_test/BUILD.gn b/base/test/benchmarktest/singleton_benchmark_test/BUILD.gn index f4f26f2..6599e3c 100644 --- a/base/test/benchmarktest/singleton_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/singleton_benchmark_test/BUILD.gn @@ -26,9 +26,8 @@ ohos_benchmarktest("SingletonTest") { ] sources = [ "singleton_benchmark_test.cpp" ] - deps = [ "//third_party/benchmark:benchmark" ] - external_deps = [ + "benchmark:benchmark", "c_utils:utils", "hilog:libhilog_base", ] diff --git a/base/test/benchmarktest/sorted_vector_benchmark_test/BUILD.gn b/base/test/benchmarktest/sorted_vector_benchmark_test/BUILD.gn index bb5b94f..0d7d1fc 100644 --- a/base/test/benchmarktest/sorted_vector_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/sorted_vector_benchmark_test/BUILD.gn @@ -26,9 +26,8 @@ ohos_benchmarktest("SortedVectorTest") { ] sources = [ "sorted_vector_benchmark_test.cpp" ] - deps = [ "//third_party/benchmark:benchmark" ] - external_deps = [ + "benchmark:benchmark", "c_utils:utils", "hilog:libhilog_base", ] diff --git a/base/test/benchmarktest/string_benchmark_test/BUILD.gn b/base/test/benchmarktest/string_benchmark_test/BUILD.gn index a8d7857..836decf 100644 --- a/base/test/benchmarktest/string_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/string_benchmark_test/BUILD.gn @@ -26,9 +26,8 @@ ohos_benchmarktest("StringTest") { ] sources = [ "string_benchmark_test.cpp" ] - deps = [ "//third_party/benchmark:benchmark" ] - external_deps = [ + "benchmark:benchmark", "c_utils:utils", "hilog:libhilog_base", ] diff --git a/base/test/benchmarktest/thread_benchmark_test/BUILD.gn b/base/test/benchmarktest/thread_benchmark_test/BUILD.gn index a564db2..6573c26 100644 --- a/base/test/benchmarktest/thread_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/thread_benchmark_test/BUILD.gn @@ -26,9 +26,8 @@ ohos_benchmarktest("ThreadTest") { ] sources = [ "thread_benchmark_test.cpp" ] - deps = [ "//third_party/benchmark:benchmark" ] - external_deps = [ + "benchmark:benchmark", "c_utils:utils", "hilog:libhilog_base", ] diff --git a/base/test/benchmarktest/thread_pool_benchmark_test/BUILD.gn b/base/test/benchmarktest/thread_pool_benchmark_test/BUILD.gn index 1e162be..d6dc860 100644 --- a/base/test/benchmarktest/thread_pool_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/thread_pool_benchmark_test/BUILD.gn @@ -26,9 +26,8 @@ ohos_benchmarktest("ThreadPoolTest") { ] sources = [ "thread_pool_benchmark_test.cpp" ] - deps = [ "//third_party/benchmark:benchmark" ] - external_deps = [ + "benchmark:benchmark", "c_utils:utils", "hilog:libhilog_base", ] diff --git a/base/test/benchmarktest/timer_benchmark_test/BUILD.gn b/base/test/benchmarktest/timer_benchmark_test/BUILD.gn index d7377a3..1866965 100644 --- a/base/test/benchmarktest/timer_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/timer_benchmark_test/BUILD.gn @@ -26,9 +26,8 @@ ohos_benchmarktest("TimerTest") { ] sources = [ "timer_benchmark_test.cpp" ] - deps = [ "//third_party/benchmark:benchmark" ] - external_deps = [ + "benchmark:benchmark", "c_utils:utils", "hilog:libhilog_base", ] diff --git a/base/test/benchmarktest/unique_fd_benchmark_test/BUILD.gn b/base/test/benchmarktest/unique_fd_benchmark_test/BUILD.gn index a35972b..e0b2aec 100644 --- a/base/test/benchmarktest/unique_fd_benchmark_test/BUILD.gn +++ b/base/test/benchmarktest/unique_fd_benchmark_test/BUILD.gn @@ -26,9 +26,8 @@ ohos_benchmarktest("UniqueFdTest") { ] sources = [ "unique_fd_benchmark_test.cpp" ] - deps = [ "//third_party/benchmark:benchmark" ] - external_deps = [ + "benchmark:benchmark", "c_utils:utils", "hilog:libhilog_base", ] diff --git a/bundle.json b/bundle.json index 6c1591b..70ca302 100644 --- a/bundle.json +++ b/bundle.json @@ -22,7 +22,8 @@ ], "deps": { "components": [ - "hilog" + "hilog", + "benchmark" ], "third_party": [ "bounds_checking_function" -- Gitee