diff options
| author | Dan Albert <danalbert@google.com> | 2017-07-28 12:39:46 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2017-08-02 17:14:10 -0700 |
| commit | 31384debd7e119f8cd054ad89a53adb3dbd6a75d (patch) | |
| tree | 63159a1dd05d904e64748a0d71356f4a4eafc901 /android/api_levels.go | |
| parent | bbe3ff4c50f5ba762bf7d0f1d175efff976dbb9f (diff) | |
Adapt to PLATFORM_VERSION_FUTURE_CODENAMES.
Don't preserve the confusing names from make. Rename AllCodenames to
ActiveCodenames, add FutureCodenames, and add CombinedCodenames to
fetch the *real* AllCodenames.
To allow `introduced=P` in NDK library definitions, we need to know
that P exists. Use the combined list of current and future API
codenames generating stubs.
Test: make ndk
Test: check out/soong/api_levels.json
Bug: None
Change-Id: I435f9ce7446236edc268a84e33474044a55a6302
Diffstat (limited to 'android/api_levels.go')
| -rw-r--r-- | android/api_levels.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android/api_levels.go b/android/api_levels.go index cf1011b97..370d553b7 100644 --- a/android/api_levels.go +++ b/android/api_levels.go @@ -68,7 +68,7 @@ func (a *apiLevelsSingleton) GenerateBuildActions(ctx blueprint.SingletonContext "N": 24, "N-MR1": 25, } - for i, codename := range ctx.Config().(Config).PlatformVersionAllCodenames() { + for i, codename := range ctx.Config().(Config).PlatformVersionCombinedCodenames() { apiLevelsMap[codename] = baseApiLevel + i } |