From 5e4338571413f3c2b1222ecef2dbcd3b9dd3fa53 Mon Sep 17 00:00:00 2001 From: mayunteng_1 Date: Wed, 6 Apr 2022 08:19:57 +0000 Subject: [PATCH 1/4] third_party/json upgrade to 3.9.1 Signed-off-by: mayunteng_1 Change-Id: I16036d85d31329be55a6ddab3dd097a8c1038be4 --- interfaces/innerkits/appverify/BUILD.gn | 4 ++-- interfaces/innerkits/appverify/test/BUILD.gn | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interfaces/innerkits/appverify/BUILD.gn b/interfaces/innerkits/appverify/BUILD.gn index b14e24c..573302b 100644 --- a/interfaces/innerkits/appverify/BUILD.gn +++ b/interfaces/innerkits/appverify/BUILD.gn @@ -19,8 +19,6 @@ if (os_level == "standard") { include_dirs = [ "//base/security/appverify/interfaces/innerkits/appverify/include", "//third_party/openssl/include", - "//third_party/json/include", - "//third_party/json/single_include", "//utils/native/base/include", ] } @@ -59,6 +57,8 @@ if (os_level == "standard") { ldflags = [ "-Wl,--exclude-libs=libcrypto_static.a" ] deps = [ + "//third_party/json:nlohmann_json_single_static", + "//third_party/json:nlohmann_json_static", "//third_party/openssl:libcrypto_static", "//utils/native/base:utils", ] diff --git a/interfaces/innerkits/appverify/test/BUILD.gn b/interfaces/innerkits/appverify/test/BUILD.gn index 2ff7630..c9d65e7 100644 --- a/interfaces/innerkits/appverify/test/BUILD.gn +++ b/interfaces/innerkits/appverify/test/BUILD.gn @@ -21,7 +21,6 @@ config("verify_test_config") { "//base/security/appverify/interfaces/innerkits/appverify/test/unittest/include", "//base/security/appverify/interfaces/innerkits/appverify/include", "//third_party/openssl/include", - "//third_party/json/single_include", "//utils/native/base/include", ] cflags = [ "-fvisibility=hidden" ] @@ -50,6 +49,7 @@ ohos_unittest("verify_test") { deps = [ "//base/security/appverify/interfaces/innerkits/appverify:libhapverify", "//third_party/googletest:gtest_main", + "//third_party/json:nlohmann_json_single_static", "//third_party/openssl:libcrypto_static", "//utils/native/base:utils", ] -- Gitee From 81e383b22b71817443846b62d84e7e958e187bad Mon Sep 17 00:00:00 2001 From: mayunteng_1 Date: Tue, 12 Apr 2022 02:29:49 +0000 Subject: [PATCH 2/4] third_party/json upgrade to 3.9.1 Signed-off-by: mayunteng_1 Change-Id: I5f34773143ccbf793c8cc8bc6e4bc53575cdbf8a --- interfaces/innerkits/appverify/BUILD.gn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interfaces/innerkits/appverify/BUILD.gn b/interfaces/innerkits/appverify/BUILD.gn index 573302b..d9a3f84 100644 --- a/interfaces/innerkits/appverify/BUILD.gn +++ b/interfaces/innerkits/appverify/BUILD.gn @@ -55,6 +55,8 @@ if (os_level == "standard") { ] ldflags = [ "-Wl,--exclude-libs=libcrypto_static.a" ] + ldflags += [ "-Wl,--exclude-libs,libnlohmann_json_static.a" ] + ldflags += [ "-Wl,--exclude-libs,nlohmann_json_single_static.a" ] deps = [ "//third_party/json:nlohmann_json_single_static", -- Gitee From 9ee9bdee49376fddafb8d2e17a047411dcf7c664 Mon Sep 17 00:00:00 2001 From: mayunteng_1 Date: Tue, 12 Apr 2022 06:32:43 +0000 Subject: [PATCH 3/4] third_party/json upgrade to 3.9.1 Signed-off-by: mayunteng_1 Change-Id: I194801e93584f5aadd495930e64dcbf75447ae93 --- interfaces/innerkits/appverify/test/BUILD.gn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interfaces/innerkits/appverify/test/BUILD.gn b/interfaces/innerkits/appverify/test/BUILD.gn index c9d65e7..a46850d 100644 --- a/interfaces/innerkits/appverify/test/BUILD.gn +++ b/interfaces/innerkits/appverify/test/BUILD.gn @@ -54,6 +54,8 @@ ohos_unittest("verify_test") { "//utils/native/base:utils", ] + ldflags = [ "-Wl,--exclude-libs,nlohmann_json_single_static.a" ] + if (is_standard_system) { defines = [ "STANDARD_SYSTEM" ] -- Gitee From c729a9380addac21aa2a3842a907f67da599e4ba Mon Sep 17 00:00:00 2001 From: mayunteng_1 Date: Tue, 12 Apr 2022 09:52:37 +0000 Subject: [PATCH 4/4] third_party/json upgrade to 3.9.1 Signed-off-by: mayunteng_1 Change-Id: I93f6135c0d9011f8f45554aaf22a57eed39355b0 --- interfaces/innerkits/appverify/BUILD.gn | 2 +- interfaces/innerkits/appverify/test/BUILD.gn | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/interfaces/innerkits/appverify/BUILD.gn b/interfaces/innerkits/appverify/BUILD.gn index d9a3f84..bc5095a 100644 --- a/interfaces/innerkits/appverify/BUILD.gn +++ b/interfaces/innerkits/appverify/BUILD.gn @@ -56,7 +56,7 @@ if (os_level == "standard") { ldflags = [ "-Wl,--exclude-libs=libcrypto_static.a" ] ldflags += [ "-Wl,--exclude-libs,libnlohmann_json_static.a" ] - ldflags += [ "-Wl,--exclude-libs,nlohmann_json_single_static.a" ] + ldflags += [ "-Wl,--exclude-libs,libnlohmann_json_single_static.a" ] deps = [ "//third_party/json:nlohmann_json_single_static", diff --git a/interfaces/innerkits/appverify/test/BUILD.gn b/interfaces/innerkits/appverify/test/BUILD.gn index a46850d..0d5fffb 100644 --- a/interfaces/innerkits/appverify/test/BUILD.gn +++ b/interfaces/innerkits/appverify/test/BUILD.gn @@ -54,7 +54,7 @@ ohos_unittest("verify_test") { "//utils/native/base:utils", ] - ldflags = [ "-Wl,--exclude-libs,nlohmann_json_single_static.a" ] + ldflags = [ "-Wl,--exclude-libs,libnlohmann_json_single_static.a" ] if (is_standard_system) { defines = [ "STANDARD_SYSTEM" ] -- Gitee