tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Generate api_levels.json from the preview codenames.

Browse source 
When the branch is configured as something less than the max codename
(for example, right now AOSP is U but V is also in development), the
active codenames list will not include V.

Bug: None
Test: None
Change-Id: Ia22388a8ba94ff00d053acb33363c3cdce7677d0
This commit is contained in:
Dan Albert 2023-03-27 20:34:01 +00:00
parent 1530719278
commit 8c7a994dfc
3 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/api_levels.go
View file

@ -466,7 +466,7 @@ func GetApiLevelsMap(config Config) map[string]int {
// https://cs.android.com/android/platform/superproject/+/master:build/bazel/rules/common/api.bzl;l=23;drc=231c7e8c8038fd478a79eb68aa5b9f5c64e0e061 // https://cs.android.com/android/platform/superproject/+/master:build/bazel/rules/common/api.bzl;l=23;drc=231c7e8c8038fd478a79eb68aa5b9f5c64e0e061
return config.Once(apiLevelsMapKey, func() interface{} { return config.Once(apiLevelsMapKey, func() interface{} {
apiLevelsMap := getApiLevelsMapReleasedVersions() apiLevelsMap := getApiLevelsMapReleasedVersions()
for i, codename := range config.PlatformVersionActiveCodenames() { for i, codename := range config.PlatformVersionAllPreviewCodenames() {
apiLevelsMap[codename] = previewAPILevelBase + i apiLevelsMap[codename] = previewAPILevelBase + i
} }

5
android/config.go
View file

@ -923,6 +923,11 @@ func (c *config) PlatformVersionActiveCodenames() []string {
return c.productVariables.Platform_version_active_codenames return c.productVariables.Platform_version_active_codenames
} }
// All unreleased codenames.
func (c *config) PlatformVersionAllPreviewCodenames() []string {
return c.productVariables.Platform_version_all_preview_codenames
}
func (c *config) ProductAAPTConfig() []string { func (c *config) ProductAAPTConfig() []string {
return c.productVariables.AAPTConfig return c.productVariables.AAPTConfig
} }

2
android/variable.go
View file

@ -199,6 +199,7 @@ type productVariables struct {
Platform_sdk_extension_version *int `json:",omitempty"` Platform_sdk_extension_version *int `json:",omitempty"`
Platform_base_sdk_extension_version *int `json:",omitempty"` Platform_base_sdk_extension_version *int `json:",omitempty"`
Platform_version_active_codenames []string `json:",omitempty"` Platform_version_active_codenames []string `json:",omitempty"`
Platform_version_all_preview_codenames []string `json:",omitempty"`
Platform_vndk_version *string `json:",omitempty"` Platform_vndk_version *string `json:",omitempty"`
Platform_systemsdk_versions []string `json:",omitempty"` Platform_systemsdk_versions []string `json:",omitempty"`
Platform_security_patch *string `json:",omitempty"` Platform_security_patch *string `json:",omitempty"`
@ -486,6 +487,7 @@ func (v *productVariables) SetDefaultConfig() {
Platform_sdk_codename: stringPtr("S"), Platform_sdk_codename: stringPtr("S"),
Platform_sdk_final: boolPtr(false), Platform_sdk_final: boolPtr(false),
Platform_version_active_codenames: []string{"S"}, Platform_version_active_codenames: []string{"S"},
Platform_version_all_preview_codenames: []string{"S"},
Platform_vndk_version: stringPtr("S"), Platform_vndk_version: stringPtr("S"),
HostArch: stringPtr("x86_64"), HostArch: stringPtr("x86_64"),