diff options
| author | 2023-03-03 14:54:09 +0000 | |
|---|---|---|
| committer | 2023-03-03 14:54:09 +0000 | |
| commit | 04a0ee54dee1d13fbff7f47842a6bc362a205baa (patch) | |
| tree | 0e0ba59ca7740fcaffd6e00543e450035b4da0c3 | |
| parent | c79d365c7190d9ea5aecfcc947ef9cb955ae342d (diff) | |
| parent | fb7f7b99ffe95ab32cf8905d6815c81e991a0de3 (diff) | |
Merge "Comments to keep Starlark/soong api logic in sync"
| -rw-r--r-- | android/api_levels.go | 6 | ||||
| -rw-r--r-- | android/config.go | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/android/api_levels.go b/android/api_levels.go index 6d7552ff7..9440ee9e7 100644 --- a/android/api_levels.go +++ b/android/api_levels.go @@ -225,6 +225,8 @@ func ApiLevelFromUser(ctx PathContext, raw string) (ApiLevel, error) { // ApiLevelFromUserWithConfig implements ApiLevelFromUser, see comments for // ApiLevelFromUser for more details. func ApiLevelFromUserWithConfig(config Config, raw string) (ApiLevel, error) { + // This logic is replicated in starlark, if changing logic here update starlark code too + // https://cs.android.com/android/platform/superproject/+/master:build/bazel/rules/common/api.bzl;l=42;drc=231c7e8c8038fd478a79eb68aa5b9f5c64e0e061 if raw == "" { panic("API level string must be non-empty") } @@ -329,6 +331,8 @@ func getApiLevelsMapReleasedVersions() map[string]int { var finalCodenamesMapKey = NewOnceKey("FinalCodenamesMap") func getFinalCodenamesMap(config Config) map[string]int { + // This logic is replicated in starlark, if changing logic here update starlark code too + // https://cs.android.com/android/platform/superproject/+/master:build/bazel/rules/common/api.bzl;l=30;drc=231c7e8c8038fd478a79eb68aa5b9f5c64e0e061 return config.Once(finalCodenamesMapKey, func() interface{} { apiLevelsMap := getApiLevelsMapReleasedVersions() @@ -355,6 +359,8 @@ var apiLevelsMapKey = NewOnceKey("ApiLevelsMap") // ApiLevelsMap has entries for preview API levels func GetApiLevelsMap(config Config) map[string]int { + // This logic is replicated in starlark, if changing logic here update starlark code too + // 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() { diff --git a/android/config.go b/android/config.go index 6412cb73d..b37d5c827 100644 --- a/android/config.go +++ b/android/config.go @@ -883,6 +883,8 @@ func (c *config) AllSupportedApiLevels() []ApiLevel { // DefaultAppTargetSdk returns the API level that platform apps are targeting. // This converts a codename to the exact ApiLevel it represents. func (c *config) DefaultAppTargetSdk(ctx EarlyModuleContext) ApiLevel { + // This logic is replicated in starlark, if changing logic here update starlark code too + // https://cs.android.com/android/platform/superproject/+/master:build/bazel/rules/common/api.bzl;l=72;drc=231c7e8c8038fd478a79eb68aa5b9f5c64e0e061 if Bool(c.productVariables.Platform_sdk_final) { return c.PlatformSdkVersion() } |