commit d10116d8b242ce3657bcbcfc5579087ee410365b
author android-build-prod (mdb) <android-build-team-robot@google.com> Tue May 26 18:29:30 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 26 18:29:30 2020 +0000
tree bcae22c18b04c66cc52e2f7747babd4b1ce0e14f
parent fee87102b39df181bb2269a526f9cd353448e4e9
parent 3861ee19664e30df0a3c69609ba09e2b0fa95507

Merge "Merge cherrypicks of [1317624, 1317625, 1317626, 1317627, 1316664] into ndk-release-r21" into ndk-release-r21

docs/changelogs/Changelog-r21.md

diff --git a/docs/changelogs/Changelog-r21.md b/docs/changelogs/Changelog-r21.md
index 6c6dedd..b0a8239 100644
--- a/docs/changelogs/Changelog-r21.md
+++ b/docs/changelogs/Changelog-r21.md
@@ -52,6 +52,32 @@
 
 [Build System Maintainers Guide]: https://android.googlesource.com/platform/ndk/+/master/docs/BuildSystemMaintainers.md
 
+## r21d
+
+ * Added APIs for Android 11:
+   * New [ImageDecoder] API.
+   * New [Thermal] API.
+   * Updated [AAudio] APIs.
+   * Updated [Bitmap] APIs.
+   * Updated [Camera] APIs.
+   * Updated [Choreographer] APIs.
+   * Updated [Native Window] APIs.
+   * Updated [NdkBinder] APIs.
+   * Updated [NeuralNetworks] APIs.
+   * OpenSLES is deprecated in favor of [AAudio]. Developers should use [Oboe]
+     to automatically select the best available API.
+
+[AAudio]: https://developer.android.com/ndk/reference/group/audio
+[Bitmap]: https://developer.android.com/ndk/reference/group/bitmap
+[Camera]: https://developer.android.com/ndk/reference/group/camera
+[Choreographer]: https://developer.android.com/ndk/reference/group/choreographer
+[ImageDecoder]: https://developer.android.com/ndk/reference/group/image-decoder
+[Native Window]: https://developer.android.com/ndk/reference/group/a-native-window
+[NdkBinder]: https://developer.android.com/ndk/reference/group/ndk-binder
+[NeuralNetworks]: https://developer.android.com/ndk/reference/group/neural-networks
+[Oboe]: https://github.com/google/oboe
+[Thermal]: https://developer.android.com/ndk/reference/group/thermal
+
 ## r21c
 
  * [Issue 1060]: A macOS app bundle that is signed and notarized is now

meta/platforms.json

diff --git a/meta/platforms.json b/meta/platforms.json
index 2afb441..a124f69 100644
--- a/meta/platforms.json
+++ b/meta/platforms.json
@@ -1,6 +1,6 @@
 {
   "min": 16,
-  "max": 29,
+  "max": 30,
   "aliases": {
     "20": 19,
     "25": 24,
@@ -16,6 +16,7 @@
     "O": 26,
     "O-MR1": 27,
     "P": 28,
-    "Q": 29
+    "Q": 29,
+    "R": 30
   }
 }

ndk/config.py

diff --git a/ndk/config.py b/ndk/config.py
index 096b3b4..7b1448e 100644
--- a/ndk/config.py
+++ b/ndk/config.py
@@ -2,7 +2,7 @@
 
 
 major = 21
-hotfix = 2
+hotfix = 3
 hotfix_str = chr(ord('a') + hotfix) if hotfix else ''
 beta = 0
 beta_str = '-beta{}'.format(beta) if beta > 0 else ''