commit 465549b5795866dd3927ee1a648f8ae749601379
author Gina Ko <yichunko@google.com> Tue Mar 26 21:30:56 2024 +0000
committer Gina Ko <yichunko@google.com> Tue Mar 26 22:46:11 2024 +0000
tree 0aa38998aec55220c21b555e745ffa20fe46531c
parent 5baf2cbcb63a799ea16d67525493b36fd028e1bc

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: Ib8bbbad29a4ad7b800e6bd1a67a401c2225b78cb

android/variable.go

diff --git a/android/variable.go b/android/variable.go
index 9b630c0..73f5bfd 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -193,13 +193,9 @@
 	// Suffix to add to generated Makefiles
 	Make_suffix *string `json:",omitempty"`
 
-	BuildId             *string `json:",omitempty"`
-	BuildNumberFile     *string `json:",omitempty"`
-	BuildHostnameFile   *string `json:",omitempty"`
-	BuildThumbprintFile *string `json:",omitempty"`
-	DisplayBuildNumber  *bool   `json:",omitempty"`
+	BuildId         *string `json:",omitempty"`
+	BuildNumberFile *string `json:",omitempty"`
 
-	Platform_display_version_name             *string  `json:",omitempty"`
 	Platform_version_name                     *string  `json:",omitempty"`
 	Platform_sdk_version                      *int     `json:",omitempty"`
 	Platform_sdk_codename                     *string  `json:",omitempty"`
@@ -300,8 +296,6 @@
 	MinimizeJavaDebugInfo        *bool    `json:",omitempty"`
 	Build_from_text_stub         *bool    `json:",omitempty"`
 
-	BuildType *string `json:",omitempty"`
-
 	Check_elf_files *bool `json:",omitempty"`
 
 	UncompressPrivAppDex             *bool    `json:",omitempty"`
@@ -478,8 +472,9 @@
 
 	AfdoProfiles []string `json:",omitempty"`
 
-	ProductManufacturer string `json:",omitempty"`
-	ProductBrand        string `json:",omitempty"`
+	ProductManufacturer string   `json:",omitempty"`
+	ProductBrand        string   `json:",omitempty"`
+	BuildVersionTags    []string `json:",omitempty"`
 
 	ReleaseVersion          string   `json:",omitempty"`
 	ReleaseAconfigValueSets []string `json:",omitempty"`
@@ -507,14 +502,6 @@
 	ExportRuntimeApis *bool `json:",omitempty"`
 
 	AconfigContainerValidation string `json:",omitempty"`
-
-	ProductLocales []string `json:",omitempty"`
-
-	ProductDefaultWifiChannels []string `json:",omitempty"`
-
-	BoardUseVbmetaDigestInFingerprint *bool `json:",omitempty"`
-
-	OemProperties []string `json:",omitempty"`
 }
 
 type PartitionQualifiedVariablesType struct {