commit 7b17361d8dff0252d9fdea521f16c6ad194cd4ac
author Spandan Das <spandandas@google.com> Wed Feb 12 15:27:24 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 12 15:27:24 2025 -0800
tree 9861f0cd24a2a58ce6a05502f1809efc6d529a01
parent 6fb837e683333f007b03db7b97ca91ccc6b01951
parent f09962ec6fc1475b08f64fa2a336a6bf3be697ff

Merge changes from topics "soong_ab_partitions.txt", "soong_otakeys.txt" into main

* changes:
  Export PRODUCT_OTA_PUBLIC_KEYS to soong migration vars
  Export AB_OTA_PARTITION to soong migration vars

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index dcd654d..c68fd1e 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -485,6 +485,8 @@
   $(call add_json_str, ProductVirtualAbCompressionFactor, $(PRODUCT_VIRTUAL_AB_COMPRESSION_FACTOR))
   $(call add_json_str, ProductVirtualAbCowVersion, $(PRODUCT_VIRTUAL_AB_COW_VERSION))
   $(call add_json_bool, AbOtaUpdater, $(filter true,$(AB_OTA_UPDATER)))
+  $(call add_json_list, AbOtaPartitions, $(AB_OTA_PARTITIONS))
+  $(call add_json_list, AbOtaKeys, $(PRODUCT_OTA_PUBLIC_KEYS))
 
   # Avb (android verified boot) stuff
   $(call add_json_bool, BoardAvbEnable, $(filter true,$(BOARD_AVB_ENABLE)))