From d2d4df16e8a72bee116503bf2b05fcc6404cdaa4 Mon Sep 17 00:00:00 2001 From: mayunteng_1 Date: Tue, 12 Apr 2022 03:39:08 +0000 Subject: [PATCH] third_party/json upgrade to 3.9.1 Signed-off-by: mayunteng_1 Change-Id: Ibb0eabbffabc5de599b2c968957db8aafbe2aa5e --- .../distributedhardwarefwkservice/BUILD.gn | 24 +++++++++++-------- .../BUILD.gn | 3 ++- .../test_resourcemanager_fuzzer/BUILD.gn | 3 ++- .../unittest/common/resourcemanager/BUILD.gn | 20 +++++++++------- 4 files changed, 29 insertions(+), 21 deletions(-) diff --git a/services/distributedhardwarefwkservice/BUILD.gn b/services/distributedhardwarefwkservice/BUILD.gn index 982d8793..6dd1ff66 100644 --- a/services/distributedhardwarefwkservice/BUILD.gn +++ b/services/distributedhardwarefwkservice/BUILD.gn @@ -13,7 +13,8 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") -import("//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni") +import( + "//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni") ohos_shared_library("distributedhardwarefwksvr") { include_dirs = [ @@ -31,26 +32,29 @@ ohos_shared_library("distributedhardwarefwksvr") { ] sources = [ + "src/accessmanager/access_manager.cpp", + "src/distributed_hardware_manager_factory.cpp", "src/distributed_hardware_service.cpp", "src/distributed_hardware_stub.cpp", - "src/distributed_hardware_manager_factory.cpp", - "src/accessmanager/access_manager.cpp", ] deps = [ + ":distributedhardware_fwk.cfg", + "${services_path}/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl", "${utils_path}:distributedhardwareutils", "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//utils/native/base:utils", "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp:devicemanagersdk", - ":distributedhardware_fwk.cfg", - "${services_path}/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl" + "//third_party/json:nlohmann_json_static", + "//utils/native/base:utils", ] + ldflags = [ "-Wl,--exclude-libs,libnlohmann_json_static.a" ] + defines = [ - "HI_LOG_ENABLE", - "DH_LOG_TAG=\"dhfwksvr\"", - "LOG_DOMAIN=0xD004100", + "HI_LOG_ENABLE", + "DH_LOG_TAG=\"dhfwksvr\"", + "LOG_DOMAIN=0xD004100", ] external_deps = [ @@ -74,4 +78,4 @@ ohos_prebuilt_etc("distributedhardware_fwk.cfg") { source = "distributedhardware_fwk.cfg" part_name = "distributed_hardware_fwk" subsystem_name = "distributedhardware" -} \ No newline at end of file +} diff --git a/services/distributedhardwarefwkserviceimpl/BUILD.gn b/services/distributedhardwarefwkserviceimpl/BUILD.gn index 19efe651..27ec0468 100644 --- a/services/distributedhardwarefwkserviceimpl/BUILD.gn +++ b/services/distributedhardwarefwkserviceimpl/BUILD.gn @@ -20,7 +20,6 @@ ohos_shared_library("distributedhardwarefwksvr_impl") { include_dirs = [ "//utils/native/base/include", "//utils/system/safwk/native/include", - "//third_party/json/include", "include", "include/componentloader", "include/versionmanager", @@ -66,8 +65,10 @@ ohos_shared_library("distributedhardwarefwksvr_impl") { "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", "//foundation/aafwk/standard/services/abilitymgr:abilityms", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", + "//third_party/json:nlohmann_json_static", "//utils/native/base:utils", ] + ldflags = [ "-Wl,--exclude-libs,libnlohmann_json_static.a" ] defines = [ "HI_LOG_ENABLE", diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/test_resourcemanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkserviceimpl/test/fuzztest/test_resourcemanager_fuzzer/BUILD.gn index 62620243..f28e6563 100644 --- a/services/distributedhardwarefwkserviceimpl/test/fuzztest/test_resourcemanager_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkserviceimpl/test/fuzztest/test_resourcemanager_fuzzer/BUILD.gn @@ -31,7 +31,6 @@ ohos_fuzztest("test_resourcemanager_fuzzer") { "${common_path}/utils/include", "${common_path}/log/include", "//utils/native/base/include", - "//third_party/json/include", "//utils/native/base/include", "//utils/system/safwk/native/include", ] @@ -46,8 +45,10 @@ ohos_fuzztest("test_resourcemanager_fuzzer") { deps = [ "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl", "//foundation/distributedhardware/distributedhardwarefwk/utils:distributedhardwareutils", + "//third_party/json:nlohmann_json_static", "//utils/native/base:utils", ] + ldflags = [ "-Wl,--exclude-libs,libnlohmann_json_static.a" ] defines = [ "HI_LOG_ENABLE", diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/resourcemanager/BUILD.gn b/services/distributedhardwarefwkserviceimpl/test/unittest/common/resourcemanager/BUILD.gn index 05ce090e..ad56577c 100644 --- a/services/distributedhardwarefwkserviceimpl/test/unittest/common/resourcemanager/BUILD.gn +++ b/services/distributedhardwarefwkserviceimpl/test/unittest/common/resourcemanager/BUILD.gn @@ -12,7 +12,9 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni") +import( + "//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni") + module_out_path = "distributed_hardware_fwk/resource_manager_test" config("module_private_config") { @@ -28,9 +30,8 @@ config("module_private_config") { "${common_path}/utils/include", "${common_path}/log/include", "//utils/native/base/include", - "//third_party/json/include", "//utils/native/base/include", - "//utils/system/safwk/native/include" + "//utils/system/safwk/native/include", ] } @@ -38,25 +39,26 @@ config("module_private_config") { ohos_unittest("ResourceManagerTest") { module_out_path = module_out_path - sources = [ - "src/resource_manager_test.cpp" - ] + sources = [ "src/resource_manager_test.cpp" ] configs = [ ":module_private_config" ] deps = [ + "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl", + "//foundation/distributedhardware/distributedhardwarefwk/utils:distributedhardwareutils", "//third_party/googletest:gtest_main", + "//third_party/json:nlohmann_json_static", "//utils/native/base:utils", - "//foundation/distributedhardware/distributedhardwarefwk/utils:distributedhardwareutils", - "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl" ] + ldflags = [ "-Wl,--exclude-libs,libnlohmann_json_static.a" ] + external_deps = [ "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "distributeddatamgr:distributeddata_inner", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", - "distributeddatamgr:distributeddata_inner" ] } -- Gitee