From d2503789c2bc8e665019a26f3f2716cd8b380603 Mon Sep 17 00:00:00 2001 From: mayunteng_1 Date: Wed, 6 Apr 2022 07:13:46 +0000 Subject: [PATCH 1/3] third_party/json upgrade to 3.9.1 Signed-off-by: mayunteng_1 Change-Id: I0ccb00bc8d7c96df245fd7d008365d60c1518711 --- frameworks/ans/core/BUILD.gn | 2 +- frameworks/ans/native/BUILD.gn | 2 +- frameworks/ans/test/moduletest/BUILD.gn | 8 ++++---- interfaces/kits/napi/ans/BUILD.gn | 2 +- test/common/acts/actsnotificationfuzztest/BUILD.gn | 2 +- test/systemtest/acts/ansDump/BUILD.gn | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/frameworks/ans/core/BUILD.gn b/frameworks/ans/core/BUILD.gn index 89211e523..5d9972d4b 100644 --- a/frameworks/ans/core/BUILD.gn +++ b/frameworks/ans/core/BUILD.gn @@ -28,7 +28,6 @@ config("public_ans_core_config") { "${interfaces_path}/innerkits/ans/native/include", "//utils/native/base/include", - "//third_party/json/single_include", "//third_party/jsoncpp/include", ] } @@ -85,6 +84,7 @@ ohos_shared_library("ans_core") { deps = [ "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", + "//third_party/json:nlohmann_json_single_static", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utils", ] diff --git a/frameworks/ans/native/BUILD.gn b/frameworks/ans/native/BUILD.gn index 7bdd65315..6b975ddf5 100644 --- a/frameworks/ans/native/BUILD.gn +++ b/frameworks/ans/native/BUILD.gn @@ -25,7 +25,6 @@ config("ans_innerkits_public_config") { "${interfaces_path}/innerkits/ans/native/include", "${frameworks_path}/ans/core/common/include", "${frameworks_path}/ans/core/include", - "//third_party/json/single_include", "//third_party/jsoncpp/include", "//utils/system/safwk/native/include", ] @@ -79,6 +78,7 @@ ohos_shared_library("ans_innerkits") { deps = [ "${frameworks_path}/ans/core:ans_core", + "//third_party/json:nlohmann_json_single_static", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utils", ] diff --git a/frameworks/ans/test/moduletest/BUILD.gn b/frameworks/ans/test/moduletest/BUILD.gn index 6aa957703..c3f8a71d2 100644 --- a/frameworks/ans/test/moduletest/BUILD.gn +++ b/frameworks/ans/test/moduletest/BUILD.gn @@ -37,7 +37,6 @@ ohos_moduletest("ans_fw_module_test") { "//utils/native/base/include", "//utils/system/safwk/native/include", "//base/notification/ans_standard/services/ans/include", - "//third_party/json/include", "//base/notification/ans_standard/interfaces/innerkits/ans/native/test/moduletest/mock/include", "//base/notification/ces_standard/interfaces/innerkits/native/include", "//base/notification/ans_standard/interfaces/innerkits/ans/native/include", @@ -71,6 +70,7 @@ ohos_moduletest("ans_fw_module_test") { "${frameworks_path}/ans/native:ans_innerkits", "${services_path}/ans:libans", "//third_party/googletest:gtest_main", + "//third_party/json:nlohmann_json_static", "//utils/native/base:utils", ] @@ -113,7 +113,6 @@ ohos_moduletest("ans_innerkits_module_publish_test") { "//utils/native/base/include", "//utils/system/safwk/native/include", "//base/notification/ans_standard/services/ans/include", - "//third_party/json/include", "//base/notification/ans_standard/interfaces/innerkits/ans/native/test/moduletest/mock/include", "//base/notification/ces_standard/interfaces/innerkits/native/include", "//base/notification/ans_standard/interfaces/innerkits/ans/native/include", @@ -146,6 +145,7 @@ ohos_moduletest("ans_innerkits_module_publish_test") { "${frameworks_path}/ans/native:ans_innerkits", "${services_path}/ans:libans", "//third_party/googletest:gtest_main", + "//third_party/json:nlohmann_json_static", "//utils/native/base:utils", ] @@ -189,7 +189,6 @@ ohos_moduletest("ans_innerkits_module_slot_test") { "//utils/native/base/include", "//utils/system/safwk/native/include", "//base/notification/ans_standard/services/ans/include", - "//third_party/json/include", "//base/notification/ans_standard/interfaces/innerkits/ans/native/test/moduletest/mock/include", "//base/notification/ces_standard/interfaces/innerkits/native/include", "//base/notification/ans_standard/interfaces/innerkits/ans/native/include", @@ -222,6 +221,7 @@ ohos_moduletest("ans_innerkits_module_slot_test") { "${frameworks_path}/ans/native:ans_innerkits", "${services_path}/ans:libans", "//third_party/googletest:gtest_main", + "//third_party/json:nlohmann_json_static", "//utils/native/base:utils", ] @@ -264,7 +264,6 @@ ohos_moduletest("ans_innerkits_module_setting_test") { "//utils/native/base/include", "//utils/system/safwk/native/include", "//base/notification/ans_standard/services/ans/include", - "//third_party/json/include", "//base/notification/ans_standard/interfaces/innerkits/ans/native/test/moduletest/mock/include", "//base/notification/ces_standard/interfaces/innerkits/native/include", "//base/notification/ans_standard/interfaces/innerkits/ans/native/include", @@ -297,6 +296,7 @@ ohos_moduletest("ans_innerkits_module_setting_test") { "${frameworks_path}/ans/native:ans_innerkits", "${services_path}/ans:libans", "//third_party/googletest:gtest_main", + "//third_party/json:nlohmann_json_static", "//utils/native/base:utils", ] diff --git a/interfaces/kits/napi/ans/BUILD.gn b/interfaces/kits/napi/ans/BUILD.gn index cc31ec338..78e7e2192 100644 --- a/interfaces/kits/napi/ans/BUILD.gn +++ b/interfaces/kits/napi/ans/BUILD.gn @@ -39,7 +39,6 @@ ohos_shared_library("notification") { "include", "//third_party/node/src", "//third_party/libuv/include", - "//third_party/json/single_include", "//third_party/jsoncpp/include", ] @@ -68,6 +67,7 @@ ohos_shared_library("notification") { "${frameworks_path}/ans/native:ans_innerkits", "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/inner/napi_common:napi_common", "//foundation/multimedia/image_standard/interfaces/innerkits:image", + "//third_party/json:nlohmann_json_single_static", "//third_party/jsoncpp:jsoncpp", "//third_party/libuv:uv_static", "//utils/native/base:utils", diff --git a/test/common/acts/actsnotificationfuzztest/BUILD.gn b/test/common/acts/actsnotificationfuzztest/BUILD.gn index 7fd68617a..45e475256 100644 --- a/test/common/acts/actsnotificationfuzztest/BUILD.gn +++ b/test/common/acts/actsnotificationfuzztest/BUILD.gn @@ -34,7 +34,6 @@ ohos_systemtest("ActsNotificationFuzzTest") { "//base/notification/ans_standard/frameworks/ans/core/include", "//base/notification/ans_standard/interfaces/innerkits/ans/native/include", "//base/notification/ans_standard/services/ans/include", - "//third_party/json/single_include", "//foundation/appexecfwk/standard/kits/appkit/native/app/include", "//foundation/appexecfwk/adapter/interfaces/innerkits/appexecfwk_base/include", "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", @@ -66,6 +65,7 @@ ohos_systemtest("ActsNotificationFuzzTest") { "//foundation/aafwk/standard/services/abilitymgr:abilityms", "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client", "//third_party/googletest:gtest_main", + "//third_party/json:nlohmann_json_single_static", "//utils/native/base:utils", ] diff --git a/test/systemtest/acts/ansDump/BUILD.gn b/test/systemtest/acts/ansDump/BUILD.gn index 34a487248..2f411695e 100644 --- a/test/systemtest/acts/ansDump/BUILD.gn +++ b/test/systemtest/acts/ansDump/BUILD.gn @@ -21,7 +21,6 @@ ohos_systemtest("AnsDumpTest") { sources = [ "ansDumpTest.cpp" ] include_dirs = [ - "//third_party/json/single_include", "//utils/native/base/include", "//utils/system/safwk/native/include", ] @@ -35,6 +34,7 @@ ohos_systemtest("AnsDumpTest") { deps = [ "${frameworks_path}/ans/core:ans_core", "//third_party/googletest:gtest_main", + "//third_party/json:nlohmann_json_single_static", "//utils/native/base:utils", ] -- Gitee From af1b6587222ad4ae9336a0cd181c19d522de8eb1 Mon Sep 17 00:00:00 2001 From: mayunteng_1 Date: Tue, 12 Apr 2022 02:44:14 +0000 Subject: [PATCH 2/3] third_party/json upgrade to 3.9. Signed-off-by: mayunteng_1 Change-Id: Ic248e51b6763bfd915937194e2fc180ac322e86e --- frameworks/ans/core/BUILD.gn | 2 ++ frameworks/ans/native/BUILD.gn | 2 ++ frameworks/ans/test/moduletest/BUILD.gn | 8 ++++++++ interfaces/kits/napi/ans/BUILD.gn | 2 ++ test/common/acts/actsnotificationfuzztest/BUILD.gn | 2 ++ test/systemtest/acts/ansDump/BUILD.gn | 2 ++ 6 files changed, 18 insertions(+) diff --git a/frameworks/ans/core/BUILD.gn b/frameworks/ans/core/BUILD.gn index 5d9972d4b..4b1336c27 100644 --- a/frameworks/ans/core/BUILD.gn +++ b/frameworks/ans/core/BUILD.gn @@ -89,6 +89,8 @@ ohos_shared_library("ans_core") { "//utils/native/base:utils", ] + ldflags = [ "-Wl,--exclude-libs,nlohmann_json_single_static.a" ] + external_deps = [ "ability_base:want", "ability_base:zuri", diff --git a/frameworks/ans/native/BUILD.gn b/frameworks/ans/native/BUILD.gn index 6b975ddf5..c5fa5627a 100644 --- a/frameworks/ans/native/BUILD.gn +++ b/frameworks/ans/native/BUILD.gn @@ -83,6 +83,8 @@ ohos_shared_library("ans_innerkits") { "//utils/native/base:utils", ] + ldflags = [ "-Wl,--exclude-libs,nlohmann_json_single_static.a" ] + external_deps = [ "ability_base:want", "ability_base:zuri", diff --git a/frameworks/ans/test/moduletest/BUILD.gn b/frameworks/ans/test/moduletest/BUILD.gn index c3f8a71d2..2fa565e7c 100644 --- a/frameworks/ans/test/moduletest/BUILD.gn +++ b/frameworks/ans/test/moduletest/BUILD.gn @@ -74,6 +74,8 @@ ohos_moduletest("ans_fw_module_test") { "//utils/native/base:utils", ] + ldflags = [ "-Wl,--exclude-libs,libnlohmann_json_static.a" ] + defines = [] if (distributed_notification_supported) { defines += [ "DISTRIBUTED_NOTIFICATION_SUPPORTED" ] @@ -149,6 +151,8 @@ ohos_moduletest("ans_innerkits_module_publish_test") { "//utils/native/base:utils", ] + ldflags = [ "-Wl,--exclude-libs,libnlohmann_json_static.a" ] + defines = [] if (distributed_notification_supported) { defines += [ "DISTRIBUTED_NOTIFICATION_SUPPORTED" ] @@ -225,6 +229,8 @@ ohos_moduletest("ans_innerkits_module_slot_test") { "//utils/native/base:utils", ] + ldflags = [ "-Wl,--exclude-libs,libnlohmann_json_static.a" ] + defines = [] if (distributed_notification_supported) { defines += [ "DISTRIBUTED_NOTIFICATION_SUPPORTED" ] @@ -300,6 +306,8 @@ ohos_moduletest("ans_innerkits_module_setting_test") { "//utils/native/base:utils", ] + ldflags = [ "-Wl,--exclude-libs,libnlohmann_json_static.a" ] + defines = [] if (distributed_notification_supported) { defines += [ "DISTRIBUTED_NOTIFICATION_SUPPORTED" ] diff --git a/interfaces/kits/napi/ans/BUILD.gn b/interfaces/kits/napi/ans/BUILD.gn index 78e7e2192..4f11040af 100644 --- a/interfaces/kits/napi/ans/BUILD.gn +++ b/interfaces/kits/napi/ans/BUILD.gn @@ -73,6 +73,8 @@ ohos_shared_library("notification") { "//utils/native/base:utils", ] + ldflags = [ "-Wl,--exclude-libs,nlohmann_json_single_static.a" ] + external_deps = [ "ability_base:base", "ability_base:want", diff --git a/test/common/acts/actsnotificationfuzztest/BUILD.gn b/test/common/acts/actsnotificationfuzztest/BUILD.gn index 45e475256..2fa936bb1 100644 --- a/test/common/acts/actsnotificationfuzztest/BUILD.gn +++ b/test/common/acts/actsnotificationfuzztest/BUILD.gn @@ -69,6 +69,8 @@ ohos_systemtest("ActsNotificationFuzzTest") { "//utils/native/base:utils", ] + ldflags = [ "-Wl,--exclude-libs,nlohmann_json_single_static.a" ] + defines = [ "APP_LOG_TAG = \"AnsFwkKitsTest\"", "LOG_DOMAIN = 0xD002200", diff --git a/test/systemtest/acts/ansDump/BUILD.gn b/test/systemtest/acts/ansDump/BUILD.gn index 2f411695e..8cb523f1b 100644 --- a/test/systemtest/acts/ansDump/BUILD.gn +++ b/test/systemtest/acts/ansDump/BUILD.gn @@ -38,6 +38,8 @@ ohos_systemtest("AnsDumpTest") { "//utils/native/base:utils", ] + ldflags = [ "-Wl,--exclude-libs,nlohmann_json_single_static.a" ] + external_deps = [ "ability_base:want", "ability_runtime:wantagent_innerkits", -- Gitee From 2beb1b1f923beca748854428783d5a914f49f767 Mon Sep 17 00:00:00 2001 From: mayunteng_1 Date: Tue, 12 Apr 2022 09:55:40 +0000 Subject: [PATCH 3/3] third_party/json upgrade to 3.9.1 Signed-off-by: mayunteng_1 Change-Id: I37221fec9235fd91542e8b8fb80332c656e1b7ce --- frameworks/ans/core/BUILD.gn | 2 +- frameworks/ans/native/BUILD.gn | 2 +- interfaces/kits/napi/ans/BUILD.gn | 2 +- test/common/acts/actsnotificationfuzztest/BUILD.gn | 2 +- test/systemtest/acts/ansDump/BUILD.gn | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frameworks/ans/core/BUILD.gn b/frameworks/ans/core/BUILD.gn index 4b1336c27..8513e6e1b 100644 --- a/frameworks/ans/core/BUILD.gn +++ b/frameworks/ans/core/BUILD.gn @@ -89,7 +89,7 @@ ohos_shared_library("ans_core") { "//utils/native/base:utils", ] - ldflags = [ "-Wl,--exclude-libs,nlohmann_json_single_static.a" ] + ldflags = [ "-Wl,--exclude-libs,libnlohmann_json_single_static.a" ] external_deps = [ "ability_base:want", diff --git a/frameworks/ans/native/BUILD.gn b/frameworks/ans/native/BUILD.gn index c5fa5627a..3ff09dc54 100644 --- a/frameworks/ans/native/BUILD.gn +++ b/frameworks/ans/native/BUILD.gn @@ -83,7 +83,7 @@ ohos_shared_library("ans_innerkits") { "//utils/native/base:utils", ] - ldflags = [ "-Wl,--exclude-libs,nlohmann_json_single_static.a" ] + ldflags = [ "-Wl,--exclude-libs,libnlohmann_json_single_static.a" ] external_deps = [ "ability_base:want", diff --git a/interfaces/kits/napi/ans/BUILD.gn b/interfaces/kits/napi/ans/BUILD.gn index 4f11040af..e4000cbe6 100644 --- a/interfaces/kits/napi/ans/BUILD.gn +++ b/interfaces/kits/napi/ans/BUILD.gn @@ -73,7 +73,7 @@ ohos_shared_library("notification") { "//utils/native/base:utils", ] - ldflags = [ "-Wl,--exclude-libs,nlohmann_json_single_static.a" ] + ldflags = [ "-Wl,--exclude-libs,libnlohmann_json_single_static.a" ] external_deps = [ "ability_base:base", diff --git a/test/common/acts/actsnotificationfuzztest/BUILD.gn b/test/common/acts/actsnotificationfuzztest/BUILD.gn index 2fa936bb1..b73fdf3dc 100644 --- a/test/common/acts/actsnotificationfuzztest/BUILD.gn +++ b/test/common/acts/actsnotificationfuzztest/BUILD.gn @@ -69,7 +69,7 @@ ohos_systemtest("ActsNotificationFuzzTest") { "//utils/native/base:utils", ] - ldflags = [ "-Wl,--exclude-libs,nlohmann_json_single_static.a" ] + ldflags = [ "-Wl,--exclude-libs,libnlohmann_json_single_static.a" ] defines = [ "APP_LOG_TAG = \"AnsFwkKitsTest\"", diff --git a/test/systemtest/acts/ansDump/BUILD.gn b/test/systemtest/acts/ansDump/BUILD.gn index 8cb523f1b..79e4c6f83 100644 --- a/test/systemtest/acts/ansDump/BUILD.gn +++ b/test/systemtest/acts/ansDump/BUILD.gn @@ -38,7 +38,7 @@ ohos_systemtest("AnsDumpTest") { "//utils/native/base:utils", ] - ldflags = [ "-Wl,--exclude-libs,nlohmann_json_single_static.a" ] + ldflags = [ "-Wl,--exclude-libs,libnlohmann_json_single_static.a" ] external_deps = [ "ability_base:want", -- Gitee