summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-05-22Snap for 8627662 from 1dda0b2a4a179763635ae92ac17b16008ebc8128 to ↵aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000android13-mainline-adservices-releaseAndroid Build Coastguard Worker
mainline-adservices-release Change-Id: Ifc7e70843459f2a3b8e2df2effa44f86411c5d8a
2022-05-19Add min_sdk_version to ndk_libandroid_supportBen Nissan
This CL adds the same min_sdk_version to ndk_libandroid_support as for the other ndk_prebuilt_static_stl targets in this Android.bp, allowing it to be depended on from AdServices. Test: m Bug: 228842813 Change-Id: I599b15ddaf43a933137ab09550eabeea25890a96
2022-05-06Snap for 8549209 from 051d5d468622de1741fc3f5013ad45597a16b50e to ↵Android Build Coastguard Worker
mainline-adservices-release Change-Id: Iec89b627f395b408cf40389e39510927c2b2ee45
2022-05-05Snap for 8545515 from ee71351fae66b9f499d2783d332c66b8780c7ba6 to ↵Android Build Coastguard Worker
mainline-adservices-release Change-Id: I243b406c58fe3954736652dac3fb2c53ecce42b3
2022-04-27Update NDK prebuilts to build 8474149. am: ee71351faeDan Albert
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/ndk/+/17947822 Change-Id: I489cd2c48ceea250cf74af096efde23551fc8190 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25Update NDK prebuilts to build 8474149.t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android13-frc-odp-releaseandroid13-devDan Albert
Taken from branch master-ndk. Bug: http://b/222341313 Test: treehugger Change-Id: If5a7374bd1008b69b8561c98a3b4457ce6b61aa8
2022-04-20Merge changes I2ae26513,Iddf3993c,I94bc5994 am: c788e51725 am: cd2360673f ↵Dan Albert
am: b24b5850aa am: ab760f6b19 Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/2067533 Change-Id: I596560a065df8566aae9cee3cd0f2f6aa1fcde37 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20Merge changes I2ae26513,Iddf3993c,I94bc5994 am: c788e51725 am: cd2360673f ↵Dan Albert
am: b24b5850aa Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/2067533 Change-Id: I4ad7e32e06fe18c5db92537f25564dce57a1808d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20Merge changes I2ae26513,Iddf3993c,I94bc5994 am: c788e51725 am: cd2360673fDan Albert
Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/2067533 Change-Id: I39ab1819c13308f4266a910805a6168f7b665a92 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20Merge changes I2ae26513,Iddf3993c,I94bc5994 am: c788e51725Dan Albert
Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/2067533 Change-Id: I2da1e5d3f715bb09348b8ccc8826dfb93e630da1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20Merge changes I2ae26513,Iddf3993c,I94bc5994Dan Albert
* changes: Relocate libc++ libraries to keep Soong happy. Updates for update.py. Update script to work on off-corp machines.
2022-04-19Relocate libc++ libraries to keep Soong happy.Dan Albert
These were removed from sources/ in the NDK because they're duplicate bloat. Rather than fixing up Soong to handle this, just relocate them to the place Soong expects them. This directory should be gone soon anyway. Bug: None Test: None Change-Id: I2ae26513bfbda2f0b206ea24a8a8904ee85de5d8
2022-04-19Updates for update.py.Dan Albert
* Remove the major version argument. We always install to "current" so it doesn't matter * Remove Android.mk files. These aren't needed and just upset the license checker * Add python gitignore * Add pylintrc * Run black * Some os.path -> pathlib updates (updated the functions I touched) * Add type info for the functions I touched Test: ./update.py --build 8328699 --use-current-branch Bug: None Change-Id: Iddf3993c1e128d78b843c79652e332cff7ecfa63
2022-03-24Update script to work on off-corp machines.Dan Albert
Test: Used this Bug: None Change-Id: I94bc599401b10409810ed304452404b28278d36e
2021-06-30Merge "Remove one more export of libandroid_support from ndk_libc++_shared" ↵Colin Cross
am: 6e6ea36e25 am: d4c8b91add am: e523f046dd am: 2778556ebb Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1751002 Change-Id: Ia3ad0270ed4f23e8867f4efb97a881b140b1e992
2021-06-30Merge "Remove one more export of libandroid_support from ndk_libc++_shared" ↵Colin Cross
am: 6e6ea36e25 am: d4c8b91add am: e523f046dd Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1751002 Change-Id: Ia731a1087c70c51ebe2cdeb41a4a61463204b8d7
2021-06-30Merge "Remove one more export of libandroid_support from ndk_libc++_shared" ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Colin Cross
am: 6e6ea36e25 am: d4c8b91add Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1751002 Change-Id: Ie87353162f32bdabee7688ec3049009b47bbbdcf
2021-06-30Merge "Remove one more export of libandroid_support from ndk_libc++_shared" ↵Colin Cross
am: 6e6ea36e25 Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1751002 Change-Id: I38492c8de7559588989456ac4299f0235b25857c
2021-06-30Merge "Remove one more export of libandroid_support from ndk_libc++_shared"android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Colin Cross
2021-06-28Remove one more export of libandroid_support from ndk_libc++_sharedColin Cross
I73df437c6cec4a1f91531391f498ca45219effbe modified ndk_libc++_static but missed ndk_libc++_shared. Test: m checkbuild Change-Id: Ie2df44742b4b0196466bc43cd533c6a785381c15
2021-06-16Merge "Move ndk_libandroid_support headers out of libc++" am: 33ad25b59b am: ↵Colin Cross
668e886d4d am: 86851cf950 am: 5622a89298 Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1736805 Change-Id: I60c35eccc5ed05f6d5c09b1bc4ea0d772d720d4f
2021-06-16Merge "Move ndk_libandroid_support headers out of libc++" am: 33ad25b59b am: ↵Colin Cross
668e886d4d am: 86851cf950 Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1736805 Change-Id: I54fc3a6bee8c1e16a3ed179ebe21ca20d5634942
2021-06-16Merge "Move ndk_libandroid_support headers out of libc++" am: 33ad25b59b am: ↵Colin Cross
668e886d4d Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1736805 Change-Id: I1dbeafd01a1dae4f9891a93f6ccf7b37b8a8df52
2021-06-16Merge "Move ndk_libandroid_support headers out of libc++" am: 33ad25b59bColin Cross
Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1736805 Change-Id: If4f562c41833bd0a24d193fb69e4ddc7416d2151
2021-06-16Merge "Move ndk_libandroid_support headers out of libc++"Colin Cross
2021-06-14Move ndk_libandroid_support headers out of libc++Colin Cross
A change to the ordering of arch-specific export_include_dirs headers like multilib.lib32.export_include_headers used in libc++ makes the relative ordering of the libc++ headers and the libandroid_support headers incorrect with this workaround. Move the headers back to ndk_libandroid_support, and ensure ndk_libandroid_support is always after ndk_libc++_static or ndk_libc++_shared in the dependency ordering instead. Test: m checkbuild Change-Id: I73df437c6cec4a1f91531391f498ca45219effbe
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I0eecda1ff2b7f3f0a47fa5e41e1f47d6be815fe7
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: ↵Ryan Prichard
40eca594b8 am: 7edbabee9f am: fa91e13f76 Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1660532 Change-Id: I82ee42885e4e8bde47dc46b9738c0825e5d82305
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: I58bc71c244d8ea74a5394f835359cf2299da98f3
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: I4b62568241f9d1e6dc2f67da34b630c4b804a836
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 am: 5ad6d14f0f Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1645879 Change-Id: I99ab58dacab9bd2f64dc54c4171360ac76aa70d5
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 22:32:40 +0000