commit 575e3b6478ec3a6f9adb534281faf8a1d69a6f67
author android-build-prod (mdb) <android-build-team-robot@google.com> Fri Apr 27 20:01:15 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 27 20:01:15 2018 +0000
tree 1b907a2827e28a77e634786d5e91c025dd1c5412
parent 6b171a700b2324b3d671d177486b849cc04ca53b
parent d621c5aa97dfe801232ff6b73f4ade9094177d8e

Merge changes I1eae20b4,Id5c59dff

* changes:
  Add missing platform codenames to ndk-build.
  Add meta/platforms.json.

build/core/setup-app-platform.mk

diff --git a/build/core/setup-app-platform.mk b/build/core/setup-app-platform.mk
index c91be99..9a1fa06 100644
--- a/build/core/setup-app-platform.mk
+++ b/build/core/setup-app-platform.mk
@@ -81,6 +81,10 @@
     override APP_PLATFORM := android-25
 else ifeq ($(APP_PLATFORM),android-O)
     override APP_PLATFORM := android-26
+else ifeq ($(APP_PLATFORM),android-O-MR1)
+    override APP_PLATFORM := android-27
+else ifeq ($(APP_PLATFORM),android-P)
+    override APP_PLATFORM := android-28
 endif
 
 endif # APP_PROJECT_PATH == null

meta/platforms.json

diff --git a/meta/platforms.json b/meta/platforms.json
new file mode 100644
index 0000000..ac4b55f
--- /dev/null
+++ b/meta/platforms.json
@@ -0,0 +1,20 @@
+{
+  "min": 16,
+  "max": 28,
+  "aliases": {
+    "20": 19,
+    "25": 24,
+    "J": 16,
+    "J-MR1": 17,
+    "J-MR2": 18,
+    "K": 19,
+    "L": 21,
+    "L-MR1": 22,
+    "M": 23,
+    "N": 24,
+    "N-MR1": 24,
+    "O": 26,
+    "O-MR1": 27,
+    "P": 28
+  }
+}