commit d13b9a24bca0b05c903e465cb54f8beebdfdcc6a
author Justin Yun <justinyun@google.com> Thu Jul 04 14:44:44 2024 +0900
committer Justin Yun <justinyun@google.com> Thu Jul 04 14:49:23 2024 +0900
tree f55e5fd11871d740dd2f8ec05f544714423b6f63
parent dc7ecb5cd20fe16aafa69dce72cc51e7dd57a024

Move otacerts module from Android.mk to Android.bp

Remove the otacerts module defined in Android.mk. Instead, provide
variables to soong.

Bug: 335364209
Test: Define "PRODUCT_DEFAULT_DEV_CERTIFICATE := \
                 build/make/target/product/security/testkey" and
      m aosp_cf_system_x86_64
Change-Id: I99a484e04984da8bd7f58deecd90c880de16fd71

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 068034b..12b4135 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -109,6 +109,8 @@
 $(call add_json_list, AAPTPrebuiltDPI,                   $(PRODUCT_AAPT_PREBUILT_DPI))
 
 $(call add_json_str,  DefaultAppCertificate,             $(PRODUCT_DEFAULT_DEV_CERTIFICATE))
+$(call add_json_list, ExtraOtaKeys,                      $(PRODUCT_EXTRA_OTA_KEYS))
+$(call add_json_list, ExtraOtaRecoveryKeys,              $(PRODUCT_EXTRA_RECOVERY_KEYS))
 $(call add_json_str,  MainlineSepolicyDevCertificates,   $(MAINLINE_SEPOLICY_DEV_CERTIFICATES))
 
 $(call add_json_str,  AppsDefaultVersionName,            $(APPS_DEFAULT_VERSION_NAME))