diff --git a/services/accesstokenmanager/BUILD.gn b/services/accesstokenmanager/BUILD.gn index f2663afa5d312186516f764f9dd5ed139fec09e6..0979b6757e627f9644f76a9b3306c14d6cb90a01 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,10 +63,13 @@ 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", ] + 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 ae4871cf07186c2cdccecdcdc4e6e1d579917b48..1c995c1595916226e24738826c9db28017258aba 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,9 +45,12 @@ 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", ] + 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 e35b82ca484ccdf9266ae7dc3795d341a691f4fa..4097acb1379281391aa0572e4ca722fad171f722 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,10 +70,13 @@ 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", ] + 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 34989d34ba985737947c42f6ea7b75cf13b53a7c..3d46092178be129673de1f7d840a6348a001505c 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,10 +80,13 @@ 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", ] + ldflags = [ "-Wl,--exclude-libs,libnlohmann_json_static.a" ] + cflags_cc = [ "-DHILOG_ENABLE" ] if (token_sync_enable == true) {