diff options
| author | Dan Albert <danalbert@google.com> | 2017-08-01 23:19:34 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-01 23:19:34 +0000 |
| commit | 35f9c2290da9c080a20012c101c5648b20e90672 (patch) | |
| tree | 1faa731287ddecf773caaf5eae6a861494049b87 /android | |
| parent | 1d83676c4919ca60df949ec635b441d96e0c4821 (diff) | |
| parent | bbe3ff4c50f5ba762bf7d0f1d175efff976dbb9f (diff) | |
| download | build_soong-35f9c2290da9c080a20012c101c5648b20e90672.tar.gz build_soong-35f9c2290da9c080a20012c101c5648b20e90672.tar.bz2 build_soong-35f9c2290da9c080a20012c101c5648b20e90672.zip | |
Merge changes from topic 'ndk-weak-stubs'
am: bbe3ff4c50
Change-Id: I00a2f6b59ee9e1dfa1f5dbf27e0dea332e686637
Diffstat (limited to 'android')
| -rw-r--r-- | android/api_levels.go | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/android/api_levels.go b/android/api_levels.go index 70b251b6..cf1011b9 100644 --- a/android/api_levels.go +++ b/android/api_levels.go @@ -55,7 +55,19 @@ func GetApiLevelsJson(ctx PathContext) Path { func (a *apiLevelsSingleton) GenerateBuildActions(ctx blueprint.SingletonContext) { baseApiLevel := 9000 - apiLevelsMap := map[string]int{} + apiLevelsMap := map[string]int{ + "G": 9, + "I": 14, + "J": 16, + "J-MR1": 17, + "J-MR2": 18, + "K": 19, + "L": 21, + "L-MR1": 22, + "M": 23, + "N": 24, + "N-MR1": 25, + } for i, codename := range ctx.Config().(Config).PlatformVersionAllCodenames() { apiLevelsMap[codename] = baseApiLevel + i } |