summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-12-06Merge "Remove unused Android.mk file" into main am: b74e66aa62 am: ↵HEADmastermainWei Li
4306e0b6af am: a888409c06 Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/2854376 Change-Id: I851a7ca94549f82bdaba8f7950d8d4be36b70c9f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06Merge "Remove unused Android.mk file" into main am: b74e66aa62 am: ↵Wei Li
2259a20fc4 am: d7eb589e7c Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/2854376 Change-Id: I0b79866abefcb06d6329542fc009795678ccfb1d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06Merge "Remove unused Android.mk file" into main am: b74e66aa62 am: 4306e0b6afWei Li
Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/2854376 Change-Id: I465cf074fc60f715586c648bbc7aeae2545de331 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06Merge "Remove unused Android.mk file" into main am: b74e66aa62 am: 2259a20fc4Wei Li
Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/2854376 Change-Id: I677b3eb4c7750a4aa990c1f9ff455710219f59af Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Merge "Remove unused Android.mk file" into main am: b74e66aa62Wei Li
Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/2854376 Change-Id: I64991b8d0b1262eec66947e637d4b1c98a65545a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Merge "Remove unused Android.mk file" into main am: b74e66aa62Wei Li
Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/2854376 Change-Id: Ia00edbec091c0c0ce3b31b8376f97cde21514ddf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Merge "Remove unused Android.mk file" into mainWei Li
2023-12-01Remove unused Android.mk fileJim Tang
Bug: 314234991 Test: m nothing Change-Id: Ibf8138884f37ec24e049927474ced37e90376c2a
2023-09-13Merge "Create a soong module for ndk_system STL headers" into main am: ↵Treehugger Robot
63e2c5671e am: 3278dc2723 am: a3ed228b33 am: 423d474ea8 am: 667bf1a56e Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/2744135 Change-Id: Iab7e9743ed0643cc526753acfc8faecf523ee978 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13Merge "Create a soong module for ndk_system STL headers" into main am: ↵Treehugger Robot
63e2c5671e am: 3278dc2723 am: a3ed228b33 am: 423d474ea8 Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/2744135 Change-Id: I64c4c8c79ca3c154fe83608967c2a3b06509d95e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13Merge "Create a soong module for ndk_system STL headers" into main am: ↵Treehugger Robot
63e2c5671e am: 3278dc2723 am: a3ed228b33 Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/2744135 Change-Id: I5cf4e645c808f9bae4087b4e8f0da41582132a35 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13Merge "Create a soong module for ndk_system STL headers" into main am: ↵Treehugger Robot
63e2c5671e am: 3278dc2723 Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/2744135 Change-Id: I9af30cc4fafbdbfbb3aeb4bbc61efbcc4fcd8dac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13Merge "Create a soong module for ndk_system STL headers" into main am: ↵Treehugger Robot
63e2c5671e Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/2744135 Change-Id: Ia48c843684232517ec0f506fc4230eac72c7f5cd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13Merge "Create a soong module for ndk_system STL headers" into mainTreehugger Robot
2023-09-06Create a soong module for ndk_system STL headersSpandan Das
This STL does not have a prebuilt, but does provide headers for compilation. Soong adds -isystem prebuilts/ndk/current/sources/cxx-stl/system/include to the compile path for modules that have stl = "ndk_system" Bazel poses stricter sandboxing constraints. In preparation for building sdk variants with Bazel, create a Soong module that explicitly specifies the .h files contributed by this STL (via export_system_include_dirs). This will be a no-op in Soong. Test: m nothing Bug: 298258442 Change-Id: If40b644fdaf23dc99a563a7265e9e4b38f8626ef
2023-07-28[automerger skipped] Skip Android U (ab/10368041) am: d233f327da -s ours am: ↵Xin Li
3064af636b -s ours am: d2e44d0e6b -s ours am: d52db72a88 -s ours am skip reason: Merged-In I6be25b1277b3d6f2efe7a9016b2f641afb8329a8 with SHA-1 ac44779175 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/ndk/+/24182809 Change-Id: I380171180b43fe2b0debe395664d1bb153163a7a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28[automerger skipped] Skip Android U (ab/10368041) am: d233f327da -s ours am: ↵Xin Li
3064af636b -s ours am: d2e44d0e6b -s ours am skip reason: Merged-In I6be25b1277b3d6f2efe7a9016b2f641afb8329a8 with SHA-1 ac44779175 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/ndk/+/24182809 Change-Id: I0502d9a74368b1ec26c4001bfe4a6a27492d1f0a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28[automerger skipped] Skip Android U (ab/10368041) am: d233f327da -s ours am: ↵Xin Li
3064af636b -s ours am skip reason: Merged-In I6be25b1277b3d6f2efe7a9016b2f641afb8329a8 with SHA-1 ac44779175 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/ndk/+/24182809 Change-Id: I2573db22c3f9036edf90520bf4b0fd9e740f892d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28[automerger skipped] Skip Android U (ab/10368041) am: d233f327da -s oursXin Li
am skip reason: Merged-In I6be25b1277b3d6f2efe7a9016b2f641afb8329a8 with SHA-1 ac44779175 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/ndk/+/24182809 Change-Id: I3133ff92323a93c1e49b5d20f8f0c133049737e6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28Skip Android U (ab/10368041)Xin Li
Bug: 291102124 Merged-In: I6be25b1277b3d6f2efe7a9016b2f641afb8329a8 Change-Id: I6a69b8b2949450427fdf5d3acec11736e3e8f6dd
2023-07-27Merge "Reland "Add rv64 prebuilts directly from the toolchain."" into main ↵Treehugger Robot
am: 381452a359 am: 35bfbee5ea am: 1a7793230a am: 4726cf661f am: 98a51cb465 Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/2677756 Change-Id: I406eda8c794c483b8121bec9699994fc801eec7e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27Merge "Reland "Add rv64 prebuilts directly from the toolchain."" into main ↵Treehugger Robot
am: 381452a359 am: 35bfbee5ea am: 1a7793230a am: 4726cf661f Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/2677756 Change-Id: Idbe716c9a3aa2d73cdf55808b8284181b084ae95 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27Merge "Reland "Add rv64 prebuilts directly from the toolchain."" into main ↵Treehugger Robot
am: 381452a359 am: 35bfbee5ea am: 1a7793230a Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/2677756 Change-Id: Ia416052909ba7125bb79193ba9948936827c7dc1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27Merge "Reland "Add rv64 prebuilts directly from the toolchain."" into main ↵Treehugger Robot
am: 381452a359 am: 35bfbee5ea Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/2677756 Change-Id: Ic0676a7c1fd54fee6387fddb8d5d8cdfd00291d9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27Merge "Reland "Add rv64 prebuilts directly from the toolchain."" into main ↵Treehugger Robot
am: 381452a359 Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/2677756 Change-Id: I8c725e6a03eb18d9035b232e6bce7f6cd983384c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27Merge "Reland "Add rv64 prebuilts directly from the toolchain."" into mainTreehugger Robot
2023-07-26Reland "Add rv64 prebuilts directly from the toolchain."Dan Albert
These are not the same version of libc++ as the rest of the prebuilts, but we need to get a V sysroot with rv64 into the NDK sooner rather than later. We've been unable to do that because the workaround for getting a libc++ NDK prebuilt for rv64 thus far has been `sdk_version: "current"` in external/libcxx, but we can't set it to "VanillaIceCream" because of trunk stable problems. This hack probably gets us across that hurdle. Bug: None Test: treehugger Change-Id: I382d79271a3fdf97ce360d3f26af3065a0405043
2023-07-26Merge "Revert "Add rv64 prebuilts directly from the toolchain."" into main ↵Mark White
am: 9f4bf52ac0 am: 0212581349 am: fb9c733ec8 am: 1f13386dd0 am: 3113a5652e Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/2676817 Change-Id: Ib39a2729963dac436f954f73b7566b639f5a1fc5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26Merge "Revert "Add rv64 prebuilts directly from the toolchain."" into main ↵Mark White
am: 9f4bf52ac0 am: 0212581349 am: fb9c733ec8 am: 1f13386dd0 Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/2676817 Change-Id: Ic7129631ab79e0a08517726b720d42686a3ee994 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26Merge "Revert "Add rv64 prebuilts directly from the toolchain."" into main ↵Mark White
am: 9f4bf52ac0 am: 0212581349 am: fb9c733ec8 Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/2676817 Change-Id: I41cf3066a1086ef7046c2c272b344d34d8f7bd9a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26Merge "Revert "Add rv64 prebuilts directly from the toolchain."" into main ↵Mark White
am: 9f4bf52ac0 am: 0212581349 Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/2676817 Change-Id: I96760351f2ce1b630c4fbbeee1bc6dd280052923 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26Merge "Revert "Add rv64 prebuilts directly from the toolchain."" into main ↵Mark White
am: 9f4bf52ac0 Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/2676817 Change-Id: I962c6236491439eccb451a83961ad5d2507da748 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26Merge "Revert "Add rv64 prebuilts directly from the toolchain."" into mainMark White
2023-07-26Revert "Add rv64 prebuilts directly from the toolchain."NaYoung Yun
This reverts commit 2cffe985a7aab21c78ff7ede1f787934fcdc8006. Reason for revert: build break Reverted changes: /q/submissionid:2676418-hack-rv64-libc%252B%252B Bug: 293214158 Bug: 293214503 Bug: 293214158 Bug: 293219471 Change-Id: I61de250fdcbd45de4e4a0322133e94c398a21afd
2023-07-26Merge "Add rv64 prebuilts directly from the toolchain." into main am: ↵Treehugger Robot
e364ea71a4 am: 7e3b5778c4 am: 92b1c81966 am: 3423aa0113 am: 84439450eb Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/2676435 Change-Id: I01d92b528a98ed5dce36e9d1a716845d1e43762c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26[automerger skipped] Merge "Remove libandroid_support." into main am: ↵Treehugger Robot
a0008c0174 am: 1508eef835 -s ours am: 555692507a -s ours am: e9277ba145 -s ours am: 6c1802f04f -s ours am skip reason: Merged-In Iee071092e3c1c514de6219ae23c4fed2a62f21d0 with SHA-1 4d7434149d is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/2667439 Change-Id: I47db0661bb6d202e49ad78f5bbaa5ca561089941 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26Merge "Add rv64 prebuilts directly from the toolchain." into main am: ↵Treehugger Robot
e364ea71a4 am: 7e3b5778c4 am: 92b1c81966 am: 3423aa0113 Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/2676435 Change-Id: I286c277b014ecd639fde8ef76c211375c989b35c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26[automerger skipped] Merge "Remove libandroid_support." into main am: ↵Treehugger Robot
a0008c0174 am: 1508eef835 -s ours am: 555692507a -s ours am: e9277ba145 -s ours am skip reason: Merged-In Iee071092e3c1c514de6219ae23c4fed2a62f21d0 with SHA-1 4d7434149d is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/2667439 Change-Id: I3df50439baff32626430ec5d2047a8e026efa3c5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26Merge "Add rv64 prebuilts directly from the toolchain." into main am: ↵Treehugger Robot
e364ea71a4 am: 7e3b5778c4 am: 92b1c81966 Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/2676435 Change-Id: I051eae913fc069c7f03ff3e8721bf0f92aa49a48 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26[automerger skipped] Merge "Remove libandroid_support." into main am: ↵Treehugger Robot
a0008c0174 am: 1508eef835 -s ours am: 555692507a -s ours am skip reason: Merged-In Iee071092e3c1c514de6219ae23c4fed2a62f21d0 with SHA-1 4d7434149d is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/2667439 Change-Id: I6e1c59efbcef53100305daaf1c48892fb67dfbb3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26Merge "Add rv64 prebuilts directly from the toolchain." into main am: ↵Treehugger Robot
e364ea71a4 am: 7e3b5778c4 Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/2676435 Change-Id: I151fa2b4dd48f0197dada67569c53f33384a4387 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26Merge "Add rv64 prebuilts directly from the toolchain." into main am: e364ea71a4Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/2676435 Change-Id: I28552c5922ce25b95706631b810e6acbe3e5f242 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26[automerger skipped] Merge "Remove libandroid_support." into main am: ↵Treehugger Robot
a0008c0174 am: 1508eef835 -s ours am skip reason: Merged-In Iee071092e3c1c514de6219ae23c4fed2a62f21d0 with SHA-1 4d7434149d is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/2667439 Change-Id: Id1fed351c3c16a67b3effc7aa12f26a86b307ef9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26Merge "Add rv64 prebuilts directly from the toolchain." into mainTreehugger Robot
2023-07-26Merge "Remove libandroid_support." into main am: a0008c0174Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/2667439 Change-Id: I02aede4dcb2cb1771d4e299ab010e6e050b8bf39 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25Merge "Remove libandroid_support." into mainTreehugger Robot
2023-07-25Add rv64 prebuilts directly from the toolchain.Dan Albert
These are not the same version of libc++ as the rest of the prebuilts, but we need to get a V sysroot with rv64 into the NDK sooner rather than later. We've been unable to do that because the workaround for getting a libc++ NDK prebuilt for rv64 thus far has been `sdk_version: "current"` in external/libcxx, but we can't set it to "VanillaIceCream" because of trunk stable problems. This hack probably gets us across that hurdle. Bug: None Test: treehugger Change-Id: I52c291f55c56f92320cbc512b76d462068d8e9a3
2023-07-24Remove libandroid_support. am: 4d7434149d am: cbec630f35 am: a0f39ebe02Dan Albert
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/ndk/+/24164458 Change-Id: I77a85506ebfc445ba0d5745a25baa65d30f11794 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-24Remove libandroid_support. am: 4d7434149d am: cbec630f35Dan Albert
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/ndk/+/24164458 Change-Id: I96903865b95ec02334da2fcae7fb988d8933edf4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-24Remove libandroid_support. am: 4d7434149dDan Albert
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/ndk/+/24164458 Change-Id: I24acb9da1d1fa791c9255e07dc44ce13461b44f1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>