StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Migrate buildinfo.sh script into Soong"" into main am: 58d9063b66 am: 39bdd9a1a3

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3015493

Change-Id: I73a8ded46e468f595749395d8b66155dda2b0faa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Gina Ko
2024-03-26 23:21:38 +00:00
committed by Automerger Merge Worker
parent a00647ee06 39bdd9a1a3
commit de2057ff52
7 changed files with 89 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
android/variable.go
View File

@@ -194,13 +194,9 @@ type ProductVariables struct {
// 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"`
@@ -301,8 +297,6 @@ type ProductVariables struct {
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"`
@@ -479,8 +473,9 @@ type ProductVariables struct {
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"`
@@ -508,14 +503,6 @@ type ProductVariables struct {
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 {