Merge "Reland "Move to NDK r21."" am: 9bc4ada44e am: 8d899d5b8e

Change-Id: Ibaaec844b291cd1b0745f5a0d5e899b28ecb9f94

2 files changed, 26 insertions, 1 deletions

diff --git a/Android.bp b/Android.bp
index 6eb3dab64..3bb391228 100644
--- a/Android.bp
+++ b/Android.bp
@@ -276,4 +276,29 @@ ndk_prebuilt_object {
     sdk_version: "28",
 }
 
+ndk_prebuilt_object {
+    name: "ndk_crtbegin_dynamic.29",
+    sdk_version: "29",
+}
+
+ndk_prebuilt_object {
+    name: "ndk_crtbegin_so.29",
+    sdk_version: "29",
+}
+
+ndk_prebuilt_object {
+    name: "ndk_crtbegin_static.29",
+    sdk_version: "29",
+}
+
+ndk_prebuilt_object {
+    name: "ndk_crtend_android.29",
+    sdk_version: "29",
+}
+
+ndk_prebuilt_object {
+    name: "ndk_crtend_so.29",
+    sdk_version: "29",
+}
+
 build = ["android_native_app_glue.bp", "cpufeatures.bp", "stl.bp"]
\ No newline at end of file
diff --git a/current b/current
index c32c32227..e8a156fa2 120000
--- a/current
+++ b/current
@@ -1 +1 @@
-r18
\ No newline at end of file
+r21
\ No newline at end of file