From bc6c7913043504483682807f79363b361a31edbe Mon Sep 17 00:00:00 2001 From: mayunteng_1 Date: Wed, 6 Apr 2022 08:24:04 +0000 Subject: [PATCH 1/2] third_party/json upgrade to 3.9.1 Signed-off-by: mayunteng_1 Change-Id: I30fe40060ac9ba059de29a15cacd80486d9ce939 --- services/accesstokenmanager/BUILD.gn | 2 +- services/accesstokenmanager/test/BUILD.gn | 2 +- services/tokensyncmanager/BUILD.gn | 3 +-- .../tokensyncmanager/test/unittest/token_sync_service/BUILD.gn | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/services/accesstokenmanager/BUILD.gn b/services/accesstokenmanager/BUILD.gn index f2663afa5..990d121d1 100644 --- a/services/accesstokenmanager/BUILD.gn +++ b/services/accesstokenmanager/BUILD.gn @@ -34,7 +34,6 @@ ohos_shared_library("accesstoken_manager_service") { "//base/security/access_token/frameworks/common/include", "//base/security/access_token/frameworks/accesstoken/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", - "//third_party/json/include", ] sources = [ @@ -64,6 +63,7 @@ ohos_shared_library("accesstoken_manager_service") { "//base/security/access_token/frameworks/accesstoken:accesstoken_communication_adapter_cxx", "//base/security/access_token/frameworks/common:accesstoken_common_cxx", "//base/security/access_token/services/accesstokenmanager:access_token.rc", + "//third_party/json:nlohmann_json_static", "//third_party/sqlite:sqlite", "//utils/native/base:utils", ] diff --git a/services/accesstokenmanager/test/BUILD.gn b/services/accesstokenmanager/test/BUILD.gn index ae4871cf0..472713b7e 100644 --- a/services/accesstokenmanager/test/BUILD.gn +++ b/services/accesstokenmanager/test/BUILD.gn @@ -29,7 +29,6 @@ ohos_unittest("libaccesstoken_manager_service_standard_test") { "//base/security/access_token/frameworks/accesstoken/include", "//base/security/access_token/interfaces/innerkits/accesstoken/main/cpp/include", "//base/security/access_token/interfaces/innerkits/nativetoken/include", - "//third_party/json/include", "//third_party/cJSON", ] @@ -46,6 +45,7 @@ ohos_unittest("libaccesstoken_manager_service_standard_test") { "//base/security/access_token/interfaces/innerkits/nativetoken:libnativetoken", "//base/security/access_token/services/accesstokenmanager/:accesstoken_manager_service", "//third_party/googletest:gtest_main", + "//third_party/json:nlohmann_json_static", "//utils/native/base:utils", ] diff --git a/services/tokensyncmanager/BUILD.gn b/services/tokensyncmanager/BUILD.gn index e35b82ca4..606968d65 100644 --- a/services/tokensyncmanager/BUILD.gn +++ b/services/tokensyncmanager/BUILD.gn @@ -32,9 +32,7 @@ ohos_shared_library("token_sync_manager_service") { "include/common", "include/device", "include/protocol", - "//third_party/json/include", "//utils/system/safwk/native/include", - "//third_party/json/include", "//base/security/access_token/frameworks/common/include", "//base/security/access_token/frameworks/accesstoken/include", "//base/security/access_token/frameworks/tokensync/include", @@ -72,6 +70,7 @@ ohos_shared_library("token_sync_manager_service") { "//base/security/access_token/frameworks/common:accesstoken_common_cxx", "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk", "//base/security/access_token/services/tokensyncmanager:token_sync.rc", + "//third_party/json:nlohmann_json_static", "//third_party/zlib:libz", "//utils/native/base:utils", ] diff --git a/services/tokensyncmanager/test/unittest/token_sync_service/BUILD.gn b/services/tokensyncmanager/test/unittest/token_sync_service/BUILD.gn index 34989d34b..e72616c46 100644 --- a/services/tokensyncmanager/test/unittest/token_sync_service/BUILD.gn +++ b/services/tokensyncmanager/test/unittest/token_sync_service/BUILD.gn @@ -56,7 +56,6 @@ ohos_unittest("libtoken_sync_service_sdk_test") { "//base/security/access_token/services/tokensyncmanager/include/device", "//base/security/access_token/services/tokensyncmanager/include/protocol", "//base/security/access_token/services/tokensyncmanager/test/mock/include", - "//third_party/json/include", "//base/security/access_token/frameworks/common/include", "//base/security/access_token/frameworks/accesstoken/include", "//base/security/access_token/frameworks/tokensync/include", @@ -81,6 +80,7 @@ ohos_unittest("libtoken_sync_service_sdk_test") { "//foundation/aafwk/standard/interfaces/innerkits/base:base", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp:devicemanagersdk", + "//third_party/json:nlohmann_json_static", "//third_party/zlib:libz", "//utils/native/base:utils", ] -- Gitee From 16f87782a148fd0ca922c7e990d6021e7dcb9e61 Mon Sep 17 00:00:00 2001 From: mayunteng_1 Date: Tue, 12 Apr 2022 02:27:07 +0000 Subject: [PATCH 2/2] third_party/json upgrade to 3.9.1 Signed-off-by: mayunteng_1 Change-Id: I068d14ffcad47e80e6009960582119ad42477754 --- services/accesstokenmanager/BUILD.gn | 2 ++ services/accesstokenmanager/test/BUILD.gn | 2 ++ services/tokensyncmanager/BUILD.gn | 2 ++ .../tokensyncmanager/test/unittest/token_sync_service/BUILD.gn | 2 ++ 4 files changed, 8 insertions(+) diff --git a/services/accesstokenmanager/BUILD.gn b/services/accesstokenmanager/BUILD.gn index 990d121d1..0979b6757 100644 --- a/services/accesstokenmanager/BUILD.gn +++ b/services/accesstokenmanager/BUILD.gn @@ -68,6 +68,8 @@ ohos_shared_library("accesstoken_manager_service") { "//utils/native/base:utils", ] + ldflags = [ "-Wl,--exclude-libs,libnlohmann_json_static.a" ] + if (token_sync_enable == true) { cflags_cc += [ "-DTOKEN_SYNC_ENABLE" ] diff --git a/services/accesstokenmanager/test/BUILD.gn b/services/accesstokenmanager/test/BUILD.gn index 472713b7e..1c995c159 100644 --- a/services/accesstokenmanager/test/BUILD.gn +++ b/services/accesstokenmanager/test/BUILD.gn @@ -49,6 +49,8 @@ ohos_unittest("libaccesstoken_manager_service_standard_test") { "//utils/native/base:utils", ] + ldflags = [ "-Wl,--exclude-libs,libnlohmann_json_static.a" ] + external_deps = [ "hiviewdfx_hilog_native:libhilog" ] } diff --git a/services/tokensyncmanager/BUILD.gn b/services/tokensyncmanager/BUILD.gn index 606968d65..4097acb13 100644 --- a/services/tokensyncmanager/BUILD.gn +++ b/services/tokensyncmanager/BUILD.gn @@ -75,6 +75,8 @@ ohos_shared_library("token_sync_manager_service") { "//utils/native/base:utils", ] + ldflags = [ "-Wl,--exclude-libs,libnlohmann_json_static.a" ] + if (token_sync_enable == true) { cflags_cc += [ "-DTOKEN_SYNC_ENABLE" ] } diff --git a/services/tokensyncmanager/test/unittest/token_sync_service/BUILD.gn b/services/tokensyncmanager/test/unittest/token_sync_service/BUILD.gn index e72616c46..3d4609217 100644 --- a/services/tokensyncmanager/test/unittest/token_sync_service/BUILD.gn +++ b/services/tokensyncmanager/test/unittest/token_sync_service/BUILD.gn @@ -85,6 +85,8 @@ ohos_unittest("libtoken_sync_service_sdk_test") { "//utils/native/base:utils", ] + ldflags = [ "-Wl,--exclude-libs,libnlohmann_json_static.a" ] + cflags_cc = [ "-DHILOG_ENABLE" ] if (token_sync_enable == true) { -- Gitee