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

Merge "buildinfo_prop generates ro.build.version.known_codenames" am: 061d352801 am: 2e4bc136fd

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

Change-Id: I28ccd4839366114cf5958aa382e10c2e45f6d302
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jiyong Park
2022-06-21 17:34:21 +00:00
committed by Automerger Merge Worker
parent 4a6df7a819 2e4bc136fd
commit 2f36d8e906
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/buildinfo_prop.go
View File

@@ -89,6 +89,7 @@ func (p *buildinfoPropModule) GenerateAndroidBuildActions(ctx ModuleContext) {
writeProp("ro.build.version.security_patch", config.PlatformSecurityPatch()) writeProp("ro.build.version.security_patch", config.PlatformSecurityPatch())
writeProp("ro.build.version.base_os", config.PlatformBaseOS()) writeProp("ro.build.version.base_os", config.PlatformBaseOS())
writeProp("ro.build.version.min_supported_target_sdk", config.PlatformMinSupportedTargetSdkVersion()) writeProp("ro.build.version.min_supported_target_sdk", config.PlatformMinSupportedTargetSdkVersion())
writeProp("ro.build.version.known_codenames", config.PlatformVersionKnownCodenames())
if config.Eng() { if config.Eng() {
writeProp("ro.build.type", "eng") writeProp("ro.build.type", "eng")
@@ -109,7 +110,6 @@ func (p *buildinfoPropModule) GenerateAndroidBuildActions(ctx ModuleContext) {
writeProp("ro.build.display.id", $BUILD_DISPLAY_ID) writeProp("ro.build.display.id", $BUILD_DISPLAY_ID)
writeProp("ro.build.version.incremental", $BUILD_NUMBER) writeProp("ro.build.version.incremental", $BUILD_NUMBER)
writeProp("ro.build.version.preview_sdk_fingerprint", $PLATFORM_PREVIEW_SDK_FINGERPRINT) writeProp("ro.build.version.preview_sdk_fingerprint", $PLATFORM_PREVIEW_SDK_FINGERPRINT)
writeProp("ro.build.version.known_codenames", $PLATFORM_VERSION_KNOWN_CODENAMES)
writeProp("ro.build.version.release_or_preview_display", $PLATFORM_DISPLAY_VERSION) writeProp("ro.build.version.release_or_preview_display", $PLATFORM_DISPLAY_VERSION)
writeProp("ro.build.date", `$DATE`) writeProp("ro.build.date", `$DATE`)
writeProp("ro.build.date.utc", `$DATE +%s`) writeProp("ro.build.date.utc", `$DATE +%s`)

4
android/config.go
View File

@@ -793,6 +793,10 @@ func (c *config) PlatformVersionLastStable() string {
return String(c.productVariables.Platform_version_last_stable) return String(c.productVariables.Platform_version_last_stable)
} }
func (c *config) PlatformVersionKnownCodenames() string {
return String(c.productVariables.Platform_version_known_codenames)
}
func (c *config) MinSupportedSdkVersion() ApiLevel { func (c *config) MinSupportedSdkVersion() ApiLevel {
return uncheckedFinalApiLevel(19) return uncheckedFinalApiLevel(19)
} }

1
android/variable.go
View File

@@ -200,6 +200,7 @@ type productVariables struct {
Platform_min_supported_target_sdk_version *string `json:",omitempty"` Platform_min_supported_target_sdk_version *string `json:",omitempty"`
Platform_base_os *string `json:",omitempty"` Platform_base_os *string `json:",omitempty"`
Platform_version_last_stable *string `json:",omitempty"` Platform_version_last_stable *string `json:",omitempty"`
Platform_version_known_codenames *string `json:",omitempty"`
DeviceName *string `json:",omitempty"` DeviceName *string `json:",omitempty"`
DeviceProduct *string `json:",omitempty"` DeviceProduct *string `json:",omitempty"`