diff options
author | Dan Albert <danalbert@google.com> | 2020-01-23 15:04:02 -0800 |
---|---|---|
committer | Dan Albert <danalbert@google.com> | 2020-01-24 21:07:24 +0000 |
commit | ca6b10eee2a150db410ca4ddf29958d171dc5d52 (patch) | |
tree | 917764d34f19313ab864ca758b714a1767ff2e7a | |
parent | 0e4bd14fba4f5a9ad14d77be68fd338dc96155ee (diff) | |
download | ndk-ca6b10eee2a150db410ca4ddf29958d171dc5d52.tar.gz |
Reland "Move to NDK r21."
This reverts commit 19bdcfafd6cf767f7bc6b469b6ba988bafc1e690.
Test: treehugger, plus local x86 build of external/conscrypt
Bug: http://b/146465110
Bug: http://b/147470750
Change-Id: I661b82f67303453f5e8c7e219b1244977134d7ee
-rw-r--r-- | Android.bp | 25 | ||||
l--------- | current | 2 |
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 @@ -1 +1 @@ -r18
\ No newline at end of file +r21
\ No newline at end of file |