commit 54101665ee88cca5307679023df2635f26f3f9cb
author Gina Ko <yichunko@google.com> Tue Mar 26 21:30:56 2024 +0000
committer Gina Ko <yichunko@google.com> Tue Mar 26 22:45:44 2024 +0000
tree 9cc6806cf3c4df481f7b28dfc92fe8fcd99457ac
parent 6a35810856883cb318793a90114c1b2f7cdb2e42

Revert "Migrate buildinfo.sh script into Soong"

Revert submission 3004875-buildinfo_prop_soong

Reason for revert: DroidMonitor-triggered revert due to breakage b/331462869

Reverted changes: /q/submissionid:3004875-buildinfo_prop_soong

Bug: 331462869
Change-Id: I02b125f10aaba538998dfe3a503ed2021405e8ae

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 1e419f3..d4c56e5 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -31,11 +31,7 @@
 
 $(call add_json_str,  BuildId,                           $(BUILD_ID))
 $(call add_json_str,  BuildNumberFile,                   build_number.txt)
-$(call add_json_str,  BuildHostnameFile,                 build_hostname.txt)
-$(call add_json_str,  BuildThumbprintFile,               build_thumbprint.txt)
-$(call add_json_bool, DisplayBuildNumber,                $(filter true,$(DISPLAY_BUILD_NUMBER)))
 
-$(call add_json_str,  Platform_display_version_name,     $(PLATFORM_DISPLAY_VERSION))
 $(call add_json_str,  Platform_version_name,             $(PLATFORM_VERSION))
 $(call add_json_val,  Platform_sdk_version,              $(PLATFORM_SDK_VERSION))
 $(call add_json_str,  Platform_sdk_codename,             $(PLATFORM_VERSION_CODENAME))
@@ -62,7 +58,6 @@
 
 $(call add_json_bool, Debuggable,                        $(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
 $(call add_json_bool, Eng,                               $(filter eng,$(TARGET_BUILD_VARIANT)))
-$(call add_json_str,  BuildType,                         $(TARGET_BUILD_TYPE))
 
 $(call add_json_str,  DeviceName,                        $(TARGET_DEVICE))
 $(call add_json_str,  DeviceProduct,                     $(TARGET_PRODUCT))
@@ -328,6 +323,7 @@
 
 $(call add_json_str,  ProductManufacturer, $(PRODUCT_MANUFACTURER))
 $(call add_json_str,  ProductBrand,        $(PRODUCT_BRAND))
+$(call add_json_list, BuildVersionTags,    $(BUILD_VERSION_TAGS))
 
 $(call add_json_str, ReleaseVersion,    $(_RELEASE_VERSION))
 $(call add_json_list, ReleaseAconfigValueSets,    $(RELEASE_ACONFIG_VALUE_SETS))
@@ -410,14 +406,6 @@
 
 $(call add_json_str, AconfigContainerValidation, $(ACONFIG_CONTAINER_VALIDATION))
 
-$(call add_json_list, ProductLocales, $(subst _,-,$(PRODUCT_LOCALES)))
-
-$(call add_json_list, ProductDefaultWifiChannels, $(PRODUCT_DEFAULT_WIFI_CHANNELS))
-
-$(call add_json_bool, BoardUseVbmetaDigestInFingerprint, $(filter true,$(BOARD_USE_VBMETA_DIGTEST_IN_FINGERPRINT)))
-
-$(call add_json_list, OemProperties, $(PRODUCT_OEM_PROPERTIES))
-
 $(call json_end)
 
 $(file >$(SOONG_VARIABLES).tmp,$(json_contents))