Add BUILDING_GSI and TARGET_SUPPORTS_64_BIT_APPS to soong_config_variable:
Some modules need to use BUILDING_GIS and TARGET_SUPPORTS_64_BIT_APPS to
distinguish whether they support 32-bit and 64-bit (e.g., Chrome).
Bug: 383686128
Test: m -j TrichromeLibrary-Stub
Change-Id: I7ea25b12220f030faa56e92560a4a5116105b161
diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index 3da75d3..73831dc 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -40,6 +40,7 @@
$(call add_soong_config_var,ANDROID,TARGET_ENABLE_MEDIADRM_64)
$(call add_soong_config_var,ANDROID,TARGET_DYNAMIC_64_32_MEDIASERVER)
$(call soong_config_set_bool,ANDROID,TARGET_SUPPORTS_32_BIT_APPS,$(if $(TARGET_SUPPORTS_32_BIT_APPS),true,false))
+$(call soong_config_set_bool,ANDROID,TARGET_SUPPORTS_64_BIT_APPS,$(if $(TARGET_SUPPORTS_64_BIT_APPS),true,false))
$(call add_soong_config_var,ANDROID,BOARD_GENFS_LABELS_VERSION)
$(call add_soong_config_var,ANDROID,ADDITIONAL_M4DEFS,$(if $(BOARD_SEPOLICY_M4DEFS),$(addprefix -D,$(BOARD_SEPOLICY_M4DEFS))))
diff --git a/target/product/gsi_release.mk b/target/product/gsi_release.mk
index 115b355..c288ad0 100644
--- a/target/product/gsi_release.mk
+++ b/target/product/gsi_release.mk
@@ -27,6 +27,7 @@
#
BUILDING_GSI := true
+$(call soong_config_set_bool,gsi,building_gsi,true)
PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
system/etc/init/config \