diff --git a/frameworks/ans/core/BUILD.gn b/frameworks/ans/core/BUILD.gn index 89211e523b23703f57d1eebe3990a03b4fb53f98..8513e6e1bea6b4f237ded34b5f15b7b2fb00448c 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,10 +84,13 @@ 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", ] + ldflags = [ "-Wl,--exclude-libs,libnlohmann_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 7bdd6531526aa9ac6b1842b72f7da87992383378..3ff09dc54e5db2c7f0bd6875bb4cfb5daf0179b1 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,10 +78,13 @@ 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", ] + ldflags = [ "-Wl,--exclude-libs,libnlohmann_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 6aa957703ec8cb4e2a897277ebf7f200ad144476..2fa565e7c49515c854dfa24c0e0771790018f9db 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,9 +70,12 @@ 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", ] + ldflags = [ "-Wl,--exclude-libs,libnlohmann_json_static.a" ] + defines = [] if (distributed_notification_supported) { defines += [ "DISTRIBUTED_NOTIFICATION_SUPPORTED" ] @@ -113,7 +115,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,9 +147,12 @@ 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", ] + ldflags = [ "-Wl,--exclude-libs,libnlohmann_json_static.a" ] + defines = [] if (distributed_notification_supported) { defines += [ "DISTRIBUTED_NOTIFICATION_SUPPORTED" ] @@ -189,7 +193,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,9 +225,12 @@ 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", ] + ldflags = [ "-Wl,--exclude-libs,libnlohmann_json_static.a" ] + defines = [] if (distributed_notification_supported) { defines += [ "DISTRIBUTED_NOTIFICATION_SUPPORTED" ] @@ -264,7 +270,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,9 +302,12 @@ 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", ] + 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 cc31ec33801acd78d2279a182dc80d3c6d4a9e41..e4000cbe6f98b537d3a4e0788373b436beaf7a95 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,11 +67,14 @@ 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", ] + ldflags = [ "-Wl,--exclude-libs,libnlohmann_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 7fd68617addc9b75259f77c5f5e7e32a983c11d1..b73fdf3dcbf5dc8cc23e29e7cd802903d4336dd3 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,9 +65,12 @@ 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", ] + ldflags = [ "-Wl,--exclude-libs,libnlohmann_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 34a4872486c74f7dafed41f972c9574ad7986ac6..79e4c6f8318119b56d48055cba9dba883d94366a 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,9 +34,12 @@ 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", ] + ldflags = [ "-Wl,--exclude-libs,libnlohmann_json_single_static.a" ] + external_deps = [ "ability_base:want", "ability_runtime:wantagent_innerkits",