commit 51a066f9de1cc6d99c13b3de26261802fcb80f7d
author Wei Li <weiwli@google.com> Thu Oct 03 05:32:55 2024 +0000
committer Wei Li <weiwli@google.com> Thu Oct 03 21:16:01 2024 +0000
tree 0439697e330845ba02918a41cf8fac132e6853f1
parent 9622b9c71d34248b764fa2a065422bafc8e5adee

Convert build/make/target/product/security/Android.mk to Android.bp

Bug: 371107666
Change-Id: If449d135781cae429d14aa5ca725a7b7910be833
Test: lunch aosp_cf_x86_64_phone-trunk_staging-eng, file product/etc/security/adb_keys should exist
Test: lunch aosp_cf_x86_64_phone-trunk_staging-user, file product/etc/security/adb_keys should NOT exist

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 0421e19..6908283 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -364,6 +364,8 @@
 $(call add_json_list, BoardAvbSystemAddHashtreeFooterArgs, $(BOARD_AVB_SYSTEM_ADD_HASHTREE_FOOTER_ARGS))
 $(call add_json_bool, BoardAvbEnable, $(filter true,$(BOARD_AVB_ENABLE)))
 
+$(call add_json_str, AdbKeys, $(PRODUCT_ADB_KEYS))
+
 $(call add_json_map, PartitionVarsForSoongMigrationOnlyDoNotUse)
   $(call add_json_str,  ProductDirectory,    $(dir $(INTERNAL_PRODUCT)))