diff options
| author | 2023-03-30 17:13:19 +0000 | |
|---|---|---|
| committer | 2023-03-30 17:13:19 +0000 | |
| commit | 6138ac81e043ae79da7502d9ef55fdf8c597b39e (patch) | |
| tree | 565cdc6fd415338ed416772b53db65f531ddb6ac | |
| parent | 8943636742128290a26497fe394044bc2e3b18da (diff) | |
| parent | a910e10b76100870519d1b6ba0c4a7566c2e37bd (diff) | |
Merge "Generate api_levels.json from the preview codenames." am: a910e10b76
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2509782
Change-Id: Icaaf7ea6813ce113a40d465c7c190ba8e81bae76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | android/api_levels.go | 2 | ||||
| -rw-r--r-- | android/config.go | 5 | ||||
| -rw-r--r-- | android/variable.go | 16 |
3 files changed, 15 insertions, 8 deletions
diff --git a/android/api_levels.go b/android/api_levels.go index 0c0b2b433..ea2afdf92 100644 --- a/android/api_levels.go +++ b/android/api_levels.go @@ -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 return config.Once(apiLevelsMapKey, func() interface{} { apiLevelsMap := getApiLevelsMapReleasedVersions() - for i, codename := range config.PlatformVersionActiveCodenames() { + for i, codename := range config.PlatformVersionAllPreviewCodenames() { apiLevelsMap[codename] = previewAPILevelBase + i } diff --git a/android/config.go b/android/config.go index 9d530919e..2d32686ec 100644 --- a/android/config.go +++ b/android/config.go @@ -923,6 +923,11 @@ func (c *config) PlatformVersionActiveCodenames() []string { 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 { return c.productVariables.AAPTConfig } diff --git a/android/variable.go b/android/variable.go index 04cc2051b..1da5974ea 100644 --- a/android/variable.go +++ b/android/variable.go @@ -199,6 +199,7 @@ type productVariables struct { Platform_sdk_extension_version *int `json:",omitempty"` Platform_base_sdk_extension_version *int `json:",omitempty"` Platform_version_active_codenames []string `json:",omitempty"` + Platform_version_all_preview_codenames []string `json:",omitempty"` Platform_vndk_version *string `json:",omitempty"` Platform_systemsdk_versions []string `json:",omitempty"` Platform_security_patch *string `json:",omitempty"` @@ -481,13 +482,14 @@ func (v *productVariables) SetDefaultConfig() { *v = productVariables{ BuildNumberFile: stringPtr("build_number.txt"), - Platform_version_name: stringPtr("S"), - Platform_base_sdk_extension_version: intPtr(30), - Platform_sdk_version: intPtr(30), - Platform_sdk_codename: stringPtr("S"), - Platform_sdk_final: boolPtr(false), - Platform_version_active_codenames: []string{"S"}, - Platform_vndk_version: stringPtr("S"), + Platform_version_name: stringPtr("S"), + Platform_base_sdk_extension_version: intPtr(30), + Platform_sdk_version: intPtr(30), + Platform_sdk_codename: stringPtr("S"), + Platform_sdk_final: boolPtr(false), + Platform_version_active_codenames: []string{"S"}, + Platform_version_all_preview_codenames: []string{"S"}, + Platform_vndk_version: stringPtr("S"), HostArch: stringPtr("x86_64"), HostSecondaryArch: stringPtr("x86"), |