From 9a8a07a448a027d43972c79085693d8fec2ff49c Mon Sep 17 00:00:00 2001 From: torrizo Date: Mon, 26 Aug 2024 01:39:21 +0000 Subject: [PATCH 1/7] update old/services/core/BUILD.gn. Signed-off-by: torrizo --- old/services/core/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/old/services/core/BUILD.gn b/old/services/core/BUILD.gn index c8c245ec..f5fb7415 100644 --- a/old/services/core/BUILD.gn +++ b/old/services/core/BUILD.gn @@ -46,7 +46,7 @@ config("device_info_manager_config") { "${device_profile_common}/include/constants", "${device_profile_common}/include/interfaces", "${device_profile_common}/include/utils", - "//third_party/json/include", + "${third_party_json}/include", ] } From 554f05d1196cd5658b5515abe3b03a74ee98fcb7 Mon Sep 17 00:00:00 2001 From: torrizo Date: Mon, 26 Aug 2024 03:53:55 +0000 Subject: [PATCH 2/7] update bundle.json. Signed-off-by: torrizo --- bundle.json | 1 - 1 file changed, 1 deletion(-) diff --git a/bundle.json b/bundle.json index 4a91024a..dacc2029 100644 --- a/bundle.json +++ b/bundle.json @@ -42,7 +42,6 @@ "relational_store" ], "third_party": [ - "googletest", "json" ] }, From 140f2fc3278161e3eb135c92ca5508d5e560156d Mon Sep 17 00:00:00 2001 From: torrizo Date: Mon, 26 Aug 2024 03:55:17 +0000 Subject: [PATCH 3/7] update common/test/deviceprofileunittest/BUILD.gn. Signed-off-by: torrizo --- common/test/deviceprofileunittest/BUILD.gn | 1 - 1 file changed, 1 deletion(-) diff --git a/common/test/deviceprofileunittest/BUILD.gn b/common/test/deviceprofileunittest/BUILD.gn index 2cc64706..6e9eb0e5 100644 --- a/common/test/deviceprofileunittest/BUILD.gn +++ b/common/test/deviceprofileunittest/BUILD.gn @@ -44,7 +44,6 @@ ohos_unittest("DeviceProfileTest") { "device_manager:devicemanagersdk", "dmsfwk:common_sdk", "eventhandler:libeventhandler", - "googletest:gtest_main", "hilog:libhilog", "init:libbegetutil", "ipc:ipc_core", From 06775fd6042191f6c3c7aeda12bee337a9976f90 Mon Sep 17 00:00:00 2001 From: torrizo Date: Mon, 26 Aug 2024 03:55:48 +0000 Subject: [PATCH 4/7] update common/test/profilechangelistenerstubunittest/BUILD.gn. Signed-off-by: torrizo --- common/test/profilechangelistenerstubunittest/BUILD.gn | 1 - 1 file changed, 1 deletion(-) diff --git a/common/test/profilechangelistenerstubunittest/BUILD.gn b/common/test/profilechangelistenerstubunittest/BUILD.gn index 8afc3dff..8b69b841 100644 --- a/common/test/profilechangelistenerstubunittest/BUILD.gn +++ b/common/test/profilechangelistenerstubunittest/BUILD.gn @@ -44,7 +44,6 @@ ohos_unittest("ProfileChangeListenerStubTest") { "device_manager:devicemanagersdk", "dmsfwk:common_sdk", "eventhandler:libeventhandler", - "googletest:gtest_main", "hilog:libhilog", "init:libbegetutil", "ipc:ipc_core", From 461c71e35c556b4e22d5e29eeabe08b4bb3e4371 Mon Sep 17 00:00:00 2001 From: torrizo Date: Mon, 26 Aug 2024 03:58:12 +0000 Subject: [PATCH 5/7] update radar/test/unittest/BUILD.gn. Signed-off-by: torrizo --- radar/test/unittest/BUILD.gn | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/radar/test/unittest/BUILD.gn b/radar/test/unittest/BUILD.gn index 4b3a35cf..119bd993 100644 --- a/radar/test/unittest/BUILD.gn +++ b/radar/test/unittest/BUILD.gn @@ -25,10 +25,7 @@ device_profile_deps = [ "${device_profile_service}:distributed_device_profile_svr", ] -device_profile_external_deps = [ - "googletest:gtest_main", - "hisysevent:libhisysevent", -] +device_profile_external_deps = [ "hisysevent:libhisysevent" ] ohos_unittest("dp_radar_helper_test_new") { module_out_path = module_output_path From 1a5b8617519eb86bdb7a2adc0146cca4eccde377 Mon Sep 17 00:00:00 2001 From: torrizo Date: Mon, 26 Aug 2024 03:59:25 +0000 Subject: [PATCH 6/7] update old/radar/test/unittest/BUILD.gn. Signed-off-by: torrizo --- old/radar/test/unittest/BUILD.gn | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/old/radar/test/unittest/BUILD.gn b/old/radar/test/unittest/BUILD.gn index 21ab1a42..05f601f8 100644 --- a/old/radar/test/unittest/BUILD.gn +++ b/old/radar/test/unittest/BUILD.gn @@ -24,10 +24,7 @@ device_profile_deps = [ "${old_device_profile_service}/core:distributed_device_profile", ] -device_profile_external_deps = [ - "googletest:gtest_main", - "hisysevent:libhisysevent", -] +device_profile_external_deps = [ "hisysevent:libhisysevent" ] ohos_unittest("dp_radar_helper_test_old") { cflags = [ From 49e92f15c92e79953b34f12346a5092c9d2ef962 Mon Sep 17 00:00:00 2001 From: torrizo Date: Mon, 26 Aug 2024 04:00:05 +0000 Subject: [PATCH 7/7] update services/core/test/BUILD.gn. Signed-off-by: torrizo --- services/core/test/BUILD.gn | 1 - 1 file changed, 1 deletion(-) diff --git a/services/core/test/BUILD.gn b/services/core/test/BUILD.gn index 526e561e..67fec78c 100644 --- a/services/core/test/BUILD.gn +++ b/services/core/test/BUILD.gn @@ -47,7 +47,6 @@ device_profile_external_deps = [ "device_manager:devicemanagersdk", "dmsfwk:common_sdk", "eventhandler:libeventhandler", - "googletest:gtest_main", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter",