summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-06-17Snap for 7468467 from 0473d50cdeb87d17fdc3e77f4a413282b9e22357 to ↵android-mainline-12.0.0_r90android-mainline-12.0.0_r76android-mainline-12.0.0_r48android-mainline-12.0.0_r31android-mainline-12.0.0_r121android-mainline-12.0.0_r11android-mainline-12.0.0_r106aml_mpr_311911090android12-mainline-mediaprovider-releaseandroid-build-team Robot
mainline-mediaprovider-release Change-Id: I4fb3b2d81ad975c750f60ed1e9859491c2bd5cde
2021-04-02Merge "Use platform prebuilts from NDK r23 canary" am: f07ecd3813 am: ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseRyan Prichard
40eca594b8 am: 7edbabee9f am: fa91e13f76 Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1660532 Change-Id: I4bfa1b1dde006290337a6b00f15a737e9e76f133
2021-04-02Merge "Use platform prebuilts from NDK r23 canary" am: f07ecd3813 am: ↵android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devRyan Prichard
40eca594b8 am: 7edbabee9f Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1660532 Change-Id: I278f08c038930feb10d1f700e9bbf2731e266d98
2021-04-02Merge "Use platform prebuilts from NDK r23 canary" am: f07ecd3813 am: 40eca594b8Ryan Prichard
Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1660532 Change-Id: I2df1299161e23ce9d3561cb7859e7a12ee7274c5
2021-04-01Merge "Use platform prebuilts from NDK r23 canary" am: f07ecd3813Ryan Prichard
Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1660532 Change-Id: I94592bfe8324efa63c4e79e00a9879ae74c0328d
2021-04-01Merge "Use platform prebuilts from NDK r23 canary"android-s-beta-2android-s-beta-1Ryan Prichard
2021-03-31Use platform prebuilts from NDK r23 canaryRyan Prichard
Needed for PAC/BTI support. The "current" symlink seems to break incremental builds, so just use ordinary files rather than a symlink. The r23 directory had come from build 7243079. Test: treehugger Bug: None Change-Id: I1c275f6099c101003deff1132c5288dd3e1bc4b3
2021-03-31Merge "Revert "Use platform prebuilts from NDK r23 canary."" am: 3ff884f0a2 ↵Ryan Prichard
am: 865012cd2f am: 1b3650fadf am: 137f78a414 Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1658454 Change-Id: Id82cfd098d27d2d129c023479e113c66c6bb22dd
2021-03-31Merge "[LSC] Add LOCAL_LICENSE_KINDS to prebuilts/ndk" am: 107feeb4f7 am: ↵Bob Badour
293bf23626 am: 7ef486b1ed am: 680e1b0539 Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1658452 Change-Id: I6745fcb889356ae2f610de12d59ffb36260d48d7
2021-03-31Merge "Revert "Use platform prebuilts from NDK r23 canary."" am: 3ff884f0a2 ↵Ryan Prichard
am: 865012cd2f am: 1b3650fadf Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1658454 Change-Id: I60610cf18ffd9044e58e1419cf251b0983e63c82
2021-03-31Merge "[LSC] Add LOCAL_LICENSE_KINDS to prebuilts/ndk" am: 107feeb4f7 am: ↵Bob Badour
293bf23626 am: 7ef486b1ed Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1658452 Change-Id: Ib4eae1e6b62cd9a88f347c8849cac8f8fa0c9047
2021-03-31Merge "Revert "Use platform prebuilts from NDK r23 canary."" am: 3ff884f0a2 ↵Ryan Prichard
am: 865012cd2f Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1658454 Change-Id: I00c34ae2c0db08f7bee1c83e7ade0b797086c919
2021-03-31Merge "Revert "Use platform prebuilts from NDK r23 canary."" am: 3ff884f0a2Ryan Prichard
Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1658454 Change-Id: Idaf7f6a9a31b0ecf6caad0f3128641aa39db5639
2021-03-31Merge "Revert "Use platform prebuilts from NDK r23 canary.""Ryan Prichard
2021-03-31Merge "[LSC] Add LOCAL_LICENSE_KINDS to prebuilts/ndk" am: 107feeb4f7 am: ↵Bob Badour
293bf23626 Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1658452 Change-Id: I9064f6465b1488042ab7fd524cba3bc166684251
2021-03-31Merge "[LSC] Add LOCAL_LICENSE_KINDS to prebuilts/ndk" am: 107feeb4f7Bob Badour
Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1658452 Change-Id: I41e6a94c000e7695800be7275bedf0f0f9c81c8f
2021-03-31Merge "[LSC] Add LOCAL_LICENSE_KINDS to prebuilts/ndk"Bob Badour
2021-03-31Revert "Use platform prebuilts from NDK r23 canary."Ryan Prichard
This reverts commit b0f80cd9ab914f8886150cdc194ba1a4a3812b1a. Reason for revert: b/184095989 Change-Id: I6136d80ad3e09b74cf19deabf307ff30ae9d15a2
2021-03-30[LSC] Add LOCAL_LICENSE_KINDS to prebuilts/ndkBob Badour
Added SPDX-license-identifier-Apache-2.0 to: r23/sources/android/native_app_glue/Android.mk r23/sources/cxx-stl/llvm-libc++/Android.mk Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to: r23/sources/android/cpufeatures/Android.mk Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-MIT SPDX-license-identifier-NCSA to: r23/sources/cxx-stl/llvm-libc++abi/Android.mk Added SPDX-license-identifier-BSD to: r23/sources/android/support/Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ia4f161f6872abe57fa4e11e29c74bff6de19d65d
2021-03-31Merge "Use platform prebuilts from NDK r23 canary." am: c6e03adb1f am: ↵Dan Albert
e6c7e73d79 am: a44ef745ba am: 5ad6d14f0f Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1645879 Change-Id: Ib0f39b10da79a7847599f64518844d9bc5d3af43
2021-03-31Merge "Use platform prebuilts from NDK r23 canary." am: c6e03adb1f am: ↵Dan Albert
e6c7e73d79 am: a44ef745ba Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1645879 Change-Id: I24d738d75af3f2ac5ed0fbdc355c5cf0cadabc1d
2021-03-30Merge changes I23e1d8fe,I3e1fac66,I9380689f,I14b9d12c am: 9f83511841 am: ↵Dan Albert
8dd009e9db am: dea19d1ba8 am: b8123e6adf Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1649948 Change-Id: Ia3441acda5f581d272fac521a13e3a3ea2c5911c
2021-03-30Merge "Use platform prebuilts from NDK r23 canary." am: c6e03adb1f am: ↵Dan Albert
e6c7e73d79 Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1645879 Change-Id: I273e681546bd266c33883e5708237e2e138a3f1f
2021-03-30Merge changes I23e1d8fe,I3e1fac66,I9380689f,I14b9d12c am: 9f83511841 am: ↵Dan Albert
8dd009e9db am: dea19d1ba8 Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1649948 Change-Id: Id375216ebe19c69bc1e281bd7978ff653f84994c
2021-03-30Merge "Use platform prebuilts from NDK r23 canary." am: c6e03adb1fDan Albert
Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1645879 Change-Id: Ia9e0248b5ce70bc2a02ce2edfae3f2ba0b5c0fd7
2021-03-30Merge "Use platform prebuilts from NDK r23 canary."Dan Albert
2021-03-30Merge changes I23e1d8fe,I3e1fac66,I9380689f,I14b9d12c am: 9f83511841 am: ↵Dan Albert
8dd009e9db Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1649948 Change-Id: I9e468e762c0d61a5db706c2fcf6ae601f1720d3f
2021-03-30Merge changes I23e1d8fe,I3e1fac66,I9380689f,I14b9d12c am: 9f83511841Dan Albert
Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1649948 Change-Id: Ia10d36190f83016e30755265c8f0eba02cacdd07
2021-03-30Merge changes I23e1d8fe,I3e1fac66,I9380689f,I14b9d12cDan Albert
* changes: Enable the NDK libunwind.a prebuilt for all archs Reapply: Hack libc++ support header to work in the platform. Update NDK prebuilts to build 7243079. Preserve libunwind from the NDK.
2021-03-29Use platform prebuilts from NDK r23 canary.Dan Albert
Needed for PAC/BTI support. Test: treehugger Bug: None Change-Id: Ib5e0612b3260ef523a15fc15cd58e6d03e0f76c3
2021-03-29Enable the NDK libunwind.a prebuilt for all archsRyan Prichard
Bug: http://b/153025717 Test: device boots Change-Id: I23e1d8fe4a9ed9087140d4ef59e687930dfdd45a
2021-03-29Reapply: Hack libc++ support header to work in the platform.Ryan Prichard
Previously applied to r21: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1363327/ The upstream LLVM file changed a bit in the meantime: https://reviews.llvm.org/D69983 Test: treehugger Bug: none Change-Id: I3e1fac6653da925b41e60d4af015a19f2c52c2de
2021-03-29Update NDK prebuilts to build 7243079.Dan Albert
Taken from branch master-ndk. Bug: None Test: treehugger Change-Id: I9380689fe97e5a16947690511ed6708604d80cca
2021-03-29Preserve libunwind from the NDK.Dan Albert
Test: ./update.py --branch master-ndk --build 7219278 r23 Bug: None Change-Id: I14b9d12ca226e3be495401aaf9246f06e0d19761
2021-03-23Merge "[LSC] Add LOCAL_LICENSE_KINDS to prebuilts/ndk" am: 50dac67963 am: ↵Treehugger Robot
426dd8cf7b am: 33da0102ba am: ad12d66fa2 Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1649818 Change-Id: Ife95a734464fa767533d04a51ab2b08706a9c8a6
2021-03-23Merge "[LSC] Add LOCAL_LICENSE_KINDS to prebuilts/ndk" am: 50dac67963 am: ↵Treehugger Robot
426dd8cf7b am: 33da0102ba Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1649818 Change-Id: I6bd30d7f2c4e7baa6f3586ee1f108bc87fb8800e
2021-03-23Merge "[LSC] Add LOCAL_LICENSE_KINDS to prebuilts/ndk" am: 50dac67963 am: ↵Treehugger Robot
426dd8cf7b Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1649818 Change-Id: I836cded102b6ed3171eadf4b547547673631734a
2021-03-23Merge "[LSC] Add LOCAL_LICENSE_KINDS to prebuilts/ndk" am: 50dac67963Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1649818 Change-Id: Ibf2e5c37b54a82d4878caf0934d121f1ba8e6b35
2021-03-23Merge "[LSC] Add LOCAL_LICENSE_KINDS to prebuilts/ndk"Treehugger Robot
2021-03-22[LSC] Add LOCAL_LICENSE_KINDS to prebuilts/ndkBob Badour
Added SPDX-license-identifier-Apache-2.0 to: r23/sources/android/native_app_glue/Android.mk r23/sources/cxx-stl/llvm-libc++/Android.mk Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to: r23/sources/android/cpufeatures/Android.mk Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-MIT SPDX-license-identifier-NCSA to: r23/sources/cxx-stl/llvm-libc++abi/Android.mk Added SPDX-license-identifier-BSD to: r23/sources/android/support/Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I5d3e24e87b9233cea35d46fba43a6cd76ce13082
2021-03-19Merge "Update NDK prebuilts to build 7219278." am: e2667121ed am: e949e99b50 ↵Dan Albert
am: 838a071966 am: 89edfc9b6f Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1645878 Change-Id: Ib3ce2721e65b8c1ec61caf3720aa0561aa8d2737
2021-03-19Merge "Update the updater to account for package updates." am: 184ebb706b ↵Dan Albert
am: 9f000102f6 am: 0780940483 am: d99586f4af Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1645877 Change-Id: I2fbf462e3dcebef517ecfff298e01d40015e741b
2021-03-19Merge "Update NDK prebuilts to build 7219278." am: e2667121ed am: e949e99b50 ↵Dan Albert
am: 838a071966 Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1645878 Change-Id: Ib909a3bac8de7a2d68491f65b7b1c672e3e58109
2021-03-19Merge "Update the updater to account for package updates." am: 184ebb706b ↵Dan Albert
am: 9f000102f6 am: 0780940483 Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1645877 Change-Id: I965dd7966bc3747c519fb6979a1e68828cbfcfb9
2021-03-19Merge "Update NDK prebuilts to build 7219278." am: e2667121ed am: e949e99b50Dan Albert
Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1645878 Change-Id: I7f59eb6d9d176c6c2a47cddcb9bc644f19afea39
2021-03-19Merge "Update the updater to account for package updates." am: 184ebb706b ↵Dan Albert
am: 9f000102f6 Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1645877 Change-Id: Icba0dd0285e2f3c02a51a62ff16685eb6aee82a9
2021-03-19Merge "Update NDK prebuilts to build 7219278." am: e2667121edDan Albert
Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1645878 Change-Id: Ibdb1b46aea0d35b53d538131a424a2eaf39f0132
2021-03-19Merge "Update the updater to account for package updates." am: 184ebb706bDan Albert
Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1645877 Change-Id: I56389d881ec5b12affca1ff7a2b29ae8118d437e
2021-03-19Merge "Update NDK prebuilts to build 7219278."Dan Albert
2021-03-19Merge "Update the updater to account for package updates."Dan Albert