Merge "buildinfo_prop generates ro.build.version.known_codenames"
This commit is contained in:
commit
061d352801
3 changed files with 6 additions and 1 deletions
|
@ -89,6 +89,7 @@ func (p *buildinfoPropModule) GenerateAndroidBuildActions(ctx ModuleContext) {
|
|||
writeProp("ro.build.version.security_patch", config.PlatformSecurityPatch())
|
||||
writeProp("ro.build.version.base_os", config.PlatformBaseOS())
|
||||
writeProp("ro.build.version.min_supported_target_sdk", config.PlatformMinSupportedTargetSdkVersion())
|
||||
writeProp("ro.build.version.known_codenames", config.PlatformVersionKnownCodenames())
|
||||
|
||||
if config.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.version.incremental", $BUILD_NUMBER)
|
||||
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.date", `$DATE`)
|
||||
writeProp("ro.build.date.utc", `$DATE +%s`)
|
||||
|
|
|
@ -793,6 +793,10 @@ func (c *config) PlatformVersionLastStable() string {
|
|||
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 {
|
||||
return uncheckedFinalApiLevel(19)
|
||||
}
|
||||
|
|
|
@ -200,6 +200,7 @@ type productVariables struct {
|
|||
Platform_min_supported_target_sdk_version *string `json:",omitempty"`
|
||||
Platform_base_os *string `json:",omitempty"`
|
||||
Platform_version_last_stable *string `json:",omitempty"`
|
||||
Platform_version_known_codenames *string `json:",omitempty"`
|
||||
|
||||
DeviceName *string `json:",omitempty"`
|
||||
DeviceProduct *string `json:",omitempty"`
|
||||
|
|
Loading…
Reference in a new issue