commit af00e0105a4f721733bd41c748142b052e025c84
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Feb 13 20:21:08 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 13 20:21:08 2025 -0800
tree 2643786f0a40aaf71d9e7e64294e88622c319323
parent f532e5726ef1c44d0845cff243add82b61cfead9
parent 6c51360b188f3a69fb44b53863120acaa4d01f68

Merge "Export ReleaseToolsExtensionDir to soong" into main

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index c68fd1e..bd52d88 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -487,6 +487,7 @@
   $(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_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