Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ddf716f authored by Spandan Das's avatar Spandan Das Committed by Automerger Merge Worker
Browse files

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

Merge changes from topics "soong_ab_partitions.txt", "soong_otakeys.txt" into main am: 7b17361d am: a1a891e1

Original change: https://android-review.googlesource.com/c/platform/build/+/3492498



Change-Id: I61933db9bba5327aa38be2e321e327ee8d297dba
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 96225cb8 a1a891e1

core/soong_config.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -487,6 +487,7 @@ $(call add_json_map, PartitionVarsForSoongMigrationOnlyDoNotUse) 
  $(call add_json_str, ProductVirtualAbCowVersion, $(PRODUCT_VIRTUAL_AB_COW_VERSION))

  $(call add_json_str, ProductVirtualAbCowVersion, $(PRODUCT_VIRTUAL_AB_COW_VERSION))

  $(call add_json_bool, AbOtaUpdater, $(filter true,$(AB_OTA_UPDATER)))

  $(call add_json_bool, AbOtaUpdater, $(filter true,$(AB_OTA_UPDATER)))

  $(call add_json_list, AbOtaPartitions, $(AB_OTA_PARTITIONS))

  $(call add_json_list, AbOtaPartitions, $(AB_OTA_PARTITIONS))

  $(call add_json_list, AbOtaKeys, $(PRODUCT_OTA_PUBLIC_KEYS))





  # Avb (android verified boot) stuff

  # Avb (android verified boot) stuff

  $(call add_json_bool, BoardAvbEnable, $(filter true,$(BOARD_AVB_ENABLE)))

  $(call add_json_bool, BoardAvbEnable, $(filter true,$(BOARD_AVB_ENABLE)))