diff options
| author | 2017-07-28 12:39:46 -0700 | |
|---|---|---|
| committer | 2017-08-02 17:14:10 -0700 | |
| commit | 31384debd7e119f8cd054ad89a53adb3dbd6a75d (patch) | |
| tree | 63159a1dd05d904e64748a0d71356f4a4eafc901 /android/variable.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/variable.go')
| -rw-r--r-- | android/variable.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/android/variable.go b/android/variable.go index 8462d0d58..74fa86801 100644 --- a/android/variable.go +++ b/android/variable.go @@ -102,8 +102,9 @@ type productVariables struct { // Suffix to add to generated Makefiles Make_suffix *string `json:",omitempty"` - Platform_sdk_version *int `json:",omitempty"` - Platform_version_all_codenames []string `json:",omitempty"` + Platform_sdk_version *int `json:",omitempty"` + Platform_version_active_codenames []string `json:",omitempty"` + Platform_version_future_codenames []string `json:",omitempty"` DeviceName *string `json:",omitempty"` DeviceArch *string `json:",omitempty"` |