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

Commit 19cabaf5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Export ReleaseToolsExtensionDir to soong" into main am: af00e010 

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



Change-Id: I69010854d831885e8cf6c08d75db2c1e2a7b94ab
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d2f220a7 af00e010

core/soong_config.mk

+3 −0
Original line number Diff line number Diff line
@@ -487,6 +487,7 @@ $(call add_json_map, PartitionVarsForSoongMigrationOnlyDoNotUse) 
  $(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))

  $(call add_json_list, AbOtaPostInstallConfig, $(AB_OTA_POSTINSTALL_CONFIG))



  # Avb (android verified boot) stuff

  $(call add_json_bool, BoardAvbEnable, $(filter true,$(BOARD_AVB_ENABLE)))
@@ -565,6 +566,8 @@ $(call add_json_map, PartitionVarsForSoongMigrationOnlyDoNotUse) 
  $(call add_json_str, ProductQuotaProjid, $(PRODUCT_QUOTA_PROJID))

  $(call add_json_str, ProductFsCompression, $(PRODUCT_FS_COMPRESSION))



  $(call add_json_str, ReleaseToolsExtensionDir, $(firstword $(TARGET_RELEASETOOLS_EXTENSIONS) $($(TARGET_DEVICE_DIR)/../common)))



$(call end_json_map)



# For converting vintf_data