From 32b0280098174f3da60c90f28e0dd0294e26c962 Mon Sep 17 00:00:00 2001 From: Miguel Date: Thu, 1 Dec 2022 18:38:26 +0000 Subject: [PATCH] Add conscrypt updatable certificates. This cl adds a new PrebuiltEtcCaCertsFactory used by ca_certificates_apex in order to create the prebuilts used by the conscrypt apex. Test: TrustedCertificateStoreTest Change-Id: Iecac0e4b7ccdce77abb5140db944ea6f42c7d77f --- etc/prebuilt_etc.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/etc/prebuilt_etc.go b/etc/prebuilt_etc.go index baad58eed..b0660df0c 100644 --- a/etc/prebuilt_etc.go +++ b/etc/prebuilt_etc.go @@ -54,6 +54,7 @@ func init() { func RegisterPrebuiltEtcBuildComponents(ctx android.RegistrationContext) { ctx.RegisterModuleType("prebuilt_etc", PrebuiltEtcFactory) ctx.RegisterModuleType("prebuilt_etc_host", PrebuiltEtcHostFactory) + ctx.RegisterModuleType("prebuilt_etc_cacerts", PrebuiltEtcCaCertsFactory) ctx.RegisterModuleType("prebuilt_root", PrebuiltRootFactory) ctx.RegisterModuleType("prebuilt_root_host", PrebuiltRootHostFactory) ctx.RegisterModuleType("prebuilt_usr_share", PrebuiltUserShareFactory) @@ -455,6 +456,17 @@ func PrebuiltEtcHostFactory() android.Module { return module } +// prebuilt_etc_host is for a host prebuilt artifact that is installed in +// /etc/ directory. +func PrebuiltEtcCaCertsFactory() android.Module { + module := &PrebuiltEtc{} + InitPrebuiltEtcModule(module, "cacerts") + // This module is device-only + android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibFirst) + android.InitBazelModule(module) + return module +} + // prebuilt_root is for a prebuilt artifact that is installed in // / directory. Can't have any sub directories. func PrebuiltRootFactory() android.Module {