From a4eb79ca52bcce99b881157c4834403f9564b1f0 Mon Sep 17 00:00:00 2001 From: amao Date: Mon, 20 May 2024 21:35:36 +0800 Subject: [PATCH 1/2] root ca Signed-off-by: amao Change-Id: I27f05bbde22fb2d180fa6cfc40fdc55f617aed6a --- interfaces/innerkits/appverify/config/BUILD.gn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/interfaces/innerkits/appverify/config/BUILD.gn b/interfaces/innerkits/appverify/config/BUILD.gn index 9dd27f3..26bf7d1 100644 --- a/interfaces/innerkits/appverify/config/BUILD.gn +++ b/interfaces/innerkits/appverify/config/BUILD.gn @@ -14,9 +14,9 @@ import("//build/ohos.gni") ohos_prebuilt_etc("trusted_apps_sources") { - if (build_public_version) { + if (build_variant == "root") { source = "OpenHarmony/trusted_apps_sources.json" - } else { + } else if (build_variant == "user") { source = "trusted_apps_sources.json" } part_name = "appverify" @@ -32,9 +32,9 @@ ohos_prebuilt_etc("trusted_apps_sources_test") { } ohos_prebuilt_etc("trusted_root_ca") { - if (build_public_version) { + if (build_variant == "root") { source = "OpenHarmony/trusted_root_ca.json" - } else { + } else if (build_variant == "user") { source = "trusted_root_ca.json" } part_name = "appverify" -- Gitee From f807f660c547067c37de075f620580abad115008 Mon Sep 17 00:00:00 2001 From: amao Date: Thu, 23 May 2024 13:46:33 +0000 Subject: [PATCH 2/2] update interfaces/innerkits/appverify/config/BUILD.gn. Signed-off-by: amao --- interfaces/innerkits/appverify/config/BUILD.gn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interfaces/innerkits/appverify/config/BUILD.gn b/interfaces/innerkits/appverify/config/BUILD.gn index 26bf7d1..62b27bf 100644 --- a/interfaces/innerkits/appverify/config/BUILD.gn +++ b/interfaces/innerkits/appverify/config/BUILD.gn @@ -14,7 +14,7 @@ import("//build/ohos.gni") ohos_prebuilt_etc("trusted_apps_sources") { - if (build_variant == "root") { + if (build_variant == "root" || !defined(sign_hap_by_path)) { source = "OpenHarmony/trusted_apps_sources.json" } else if (build_variant == "user") { source = "trusted_apps_sources.json" @@ -32,7 +32,7 @@ ohos_prebuilt_etc("trusted_apps_sources_test") { } ohos_prebuilt_etc("trusted_root_ca") { - if (build_variant == "root") { + if (build_variant == "root" || !defined(sign_hap_by_path)) { source = "OpenHarmony/trusted_root_ca.json" } else if (build_variant == "user") { source = "trusted_root_ca.json" -- Gitee