Commit Graph

80289 Commits

Author SHA1 Message Date
Cole Faust
2dddaa3246 Merge "Sandbox libcore-non-cts-tests-txt" into main am: d3fea22835
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2854024

Change-Id: I87800233557a6af7300b3cbf2c526be26a52bd2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 19:20:38 +00:00
Colin Cross
0d5dd390c6 Merge "Move test data installation to Soong" into main 2023-12-01 18:56:01 +00:00
Colin Cross
64823ec0be Merge "Update go.mod and go.work to 1.21" into main 2023-12-01 18:55:07 +00:00
Cole Faust
d3fea22835 Merge "Sandbox libcore-non-cts-tests-txt" into main 2023-12-01 18:51:01 +00:00
Automerger Merge Worker
3314967f92 Merge "Merge "Bump default experimental from gnu++2a to gnu++2b." into main am: a1d45b8ec1 am: 3cdf0f0678" into udc-qpr-dev-plus-aosp 2023-12-01 18:49:57 +00:00
Tomasz Wasilczyk
0063fb982b Merge "Bump default experimental from gnu++2a to gnu++2b." into main am: a1d45b8ec1 am: 3cdf0f0678
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2832038

Change-Id: I2fe2a7cbeb3dff26f55bcf2efa2e2c2319c86714
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 18:49:49 +00:00
Tomasz Wasilczyk
b8b79e70b8 Merge "Bump default experimental from gnu++2a to gnu++2b." into main am: a1d45b8ec1 am: dfb192e8a2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2832038

Change-Id: Iee3634887de41e6366eccedf08a54298fdaef4fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 18:49:43 +00:00
Roshan Pius
f85781b4d1 [automerger skipped] Merge "soong(nfc): Create framework-nfc sdk library" into main am: 66b10a7ffa am: 6436b59c2e -s ours
am skip reason: Merged-In I309e76165f5563147dde5e581316ee4ac463fbc4 with SHA-1 92307ffa58 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2828288

Change-Id: If63505ccf16efd34c972496def1257676b5f4f6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 18:49:18 +00:00
Tomasz Wasilczyk
dfb192e8a2 Merge "Bump default experimental from gnu++2a to gnu++2b." into main am: a1d45b8ec1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2832038

Change-Id: I8e2a821c7284411a0e5348ebb9aff3ebebd68e84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 18:46:39 +00:00
Roshan Pius
84d2ef078e Merge "soong(nfc): Create framework-nfc sdk library" into main am: 66b10a7ffa am: ae653f7e03
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2828288

Change-Id: I78a22913fbaf0db0822b0647b4e4890b7c859ef2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 18:33:49 +00:00
Tomasz Wasilczyk
3cdf0f0678 Merge "Bump default experimental from gnu++2a to gnu++2b." into main am: a1d45b8ec1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2832038

Change-Id: I5782ed6df7d35d9299a863e7a1222e972fc5df71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 18:33:19 +00:00
Roshan Pius
6436b59c2e Merge "soong(nfc): Create framework-nfc sdk library" into main am: 66b10a7ffa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2828288

Change-Id: I7b0708d40ed91217bc4325f7001ae636b686a09f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 18:20:31 +00:00
Roshan Pius
ae653f7e03 Merge "soong(nfc): Create framework-nfc sdk library" into main am: 66b10a7ffa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2828288

Change-Id: Id48c28f9d7463325afe5d2d79ad2dba6e36ef582
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 18:09:22 +00:00
Serdar Kocdemir
4f6d0b281f Merge "Revert^3 "Enable dex container (DEX v41) for the whole system"" into main am: 3d11d51733 am: 3199916366 am: e89483e4bc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2852551

Change-Id: I1021954657589306640c2bf66c8a2922656292ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 17:27:29 +00:00
Serdar Kocdemir
2e284d4698 Merge "Revert^3 "Enable dex container (DEX v41) for the whole system"" into main am: 3d11d51733 am: 96e84f84ac am: c6176eb969
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2852551

Change-Id: Ibaf846649f57fb4c1b403462c45dd5373a6eec03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 17:26:10 +00:00
Tomasz Wasilczyk
a1d45b8ec1 Merge "Bump default experimental from gnu++2a to gnu++2b." into main 2023-12-01 17:21:01 +00:00
Roshan Pius
66b10a7ffa Merge "soong(nfc): Create framework-nfc sdk library" into main 2023-12-01 17:12:39 +00:00
Serdar Kocdemir
e89483e4bc Merge "Revert^3 "Enable dex container (DEX v41) for the whole system"" into main am: 3d11d51733 am: 3199916366
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2852551

Change-Id: I4e9e19af1485428b4062bf862a111bb91a7e0dee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 16:55:08 +00:00
Serdar Kocdemir
c6176eb969 Merge "Revert^3 "Enable dex container (DEX v41) for the whole system"" into main am: 3d11d51733 am: 96e84f84ac
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2852551

Change-Id: Ic4f33ebd8a4bbc688e3e5c4360fd2f9bfe27bc3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 16:52:38 +00:00
Serdar Kocdemir
3199916366 Merge "Revert^3 "Enable dex container (DEX v41) for the whole system"" into main am: 3d11d51733
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2852551

Change-Id: If15286412361df19293b5637f84f430840a87321
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 16:31:58 +00:00
Serdar Kocdemir
96e84f84ac Merge "Revert^3 "Enable dex container (DEX v41) for the whole system"" into main am: 3d11d51733
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2852551

Change-Id: Ideb430cdb884fde634ff497108ba63228e3bc3f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 16:22:21 +00:00
Serdar Kocdemir
3d11d51733 Merge "Revert^3 "Enable dex container (DEX v41) for the whole system"" into main 2023-12-01 15:39:47 +00:00
Serdar Kocdemir
0968a93679 Revert^3 "Enable dex container (DEX v41) for the whole system"
This reverts commit e4d0e949ce.

Reason for revert: test monitor b/314212435 

Change-Id: I53cd60d82f432d4eff132b5ee28227ece1ded7af
2023-12-01 13:33:11 +00:00
Treehugger Robot
197e28ec19 Merge "Update Soong OWNERS." into main am: 11d164a7af am: c8d7254be4 am: b944556c53
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2854226

Change-Id: Iff58f896fc2768792a151d7837af3ec40432c7fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 09:18:20 +00:00
Treehugger Robot
c2ef0dd8cd Merge "Update Soong OWNERS." into main am: 11d164a7af am: 933979baa9 am: f170ffbc80
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2854226

Change-Id: I424abd97214dcb1588bd6de2f4593edf84b4029e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 09:17:29 +00:00
Treehugger Robot
b944556c53 Merge "Update Soong OWNERS." into main am: 11d164a7af am: c8d7254be4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2854226

Change-Id: Ibf9a0e2c7b4c35fe4ef0a64bf25623becc50753e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 08:46:41 +00:00
Treehugger Robot
f170ffbc80 Merge "Update Soong OWNERS." into main am: 11d164a7af am: 933979baa9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2854226

Change-Id: Ie99dcabd7cb6b1502bfe983371fe8b45426f7fea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 08:44:47 +00:00
Treehugger Robot
933979baa9 Merge "Update Soong OWNERS." into main am: 11d164a7af
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2854226

Change-Id: Ie39e6079610894fa7c50d2747a54732b8a9f8e6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 08:21:20 +00:00
Treehugger Robot
c8d7254be4 Merge "Update Soong OWNERS." into main am: 11d164a7af
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2854226

Change-Id: I5b3ce50515d45ce5998674419de0b3d1fae30098
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 08:13:53 +00:00
Treehugger Robot
11d164a7af Merge "Update Soong OWNERS." into main 2023-12-01 07:32:00 +00:00
Matthew Maurer
e168f806e3 rust: Enable ELF TLS by default in platform Rust am: 15675d5936 am: 7514a31dc7 am: b324ae6232
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2855216

Change-Id: Iff4526941e0dd13e084fec920507e8e4ba5de700
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 05:11:53 +00:00
Matthew Maurer
b324ae6232 rust: Enable ELF TLS by default in platform Rust am: 15675d5936 am: 7514a31dc7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2855216

Change-Id: I31031ebee45c691e8b12b8be86b57e0918e2a309
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 04:39:14 +00:00
Matthew Maurer
aafb409fb3 rust: Enable ELF TLS by default in platform Rust am: 15675d5936 am: fc1eda3b08 am: 3261b743f1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2855216

Change-Id: Ifd274c63fe725496bc49b5eaca7815bf7c7a3e88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 04:23:10 +00:00
Colin Cross
fc19bfa650 Update go.mod and go.work to 1.21
Code in build/soong is using new builtins like max, update go.work
and go.mod to require 1.21 so that go test ./... works.

Fixes:
ui/status/ninja.go:193:25: max requires go1.21 or later (-lang was set to go1.20; check go.mod)

Test: go test ./...
Change-Id: I38f1a2298937db0d7c741b2183540fa3d02dac79
2023-12-01 04:12:03 +00:00
Matthew Maurer
7514a31dc7 rust: Enable ELF TLS by default in platform Rust am: 15675d5936
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2855216

Change-Id: I7f16bd929f03b9722dafe1d041d545c3ed72f344
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 03:58:31 +00:00
Matthew Maurer
3261b743f1 rust: Enable ELF TLS by default in platform Rust am: 15675d5936 am: fc1eda3b08
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2855216

Change-Id: I7efd38e26726d2ce99dc6f7fa00d98de62875ff9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 03:52:02 +00:00
Matthew Maurer
fc1eda3b08 rust: Enable ELF TLS by default in platform Rust am: 15675d5936
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2855216

Change-Id: Id00ea899b2e69ba7d5a33e6c0adba61848d17353
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 03:18:39 +00:00
Elliott Hughes
74780e61dc riscv64: stop explicitly disabling emutls.
riscv64 has always had ELF TLS (and the emutls bugs have been fixed now
too).

Test: treehugger
Change-Id: I8dd1d28d4f28a442130e4cf536166ea733f16a96
2023-12-01 02:08:05 +00:00
David Srbecky
b30033a70e Merge "Revert^2 "Enable dex container (DEX v41) for the whole system"" into main am: 8e1efb7fc5 am: c65e421074 am: e4fc93634d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853426

Change-Id: Ic08aa9bae67e2db79238b28ea3f7eb3c19d7614b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 01:06:09 +00:00
David Srbecky
e4fc93634d Merge "Revert^2 "Enable dex container (DEX v41) for the whole system"" into main am: 8e1efb7fc5 am: c65e421074
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853426

Change-Id: I323f414c5baafc1408d3c52a764c0a9fa7ceee69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 00:50:31 +00:00
David Srbecky
e90dc4b4fb Merge "Revert^2 "Enable dex container (DEX v41) for the whole system"" into main am: 8e1efb7fc5 am: 0cc9d2673f am: a8c63ff7bf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853426

Change-Id: I413cc8b290bf3497ac28898f02ca699d081fbb93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 00:48:42 +00:00
David Srbecky
a8c63ff7bf Merge "Revert^2 "Enable dex container (DEX v41) for the whole system"" into main am: 8e1efb7fc5 am: 0cc9d2673f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853426

Change-Id: Icd7734fd09eda1e1cb7843b0df643071d3fac8dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 00:14:13 +00:00
David Srbecky
c65e421074 Merge "Revert^2 "Enable dex container (DEX v41) for the whole system"" into main am: 8e1efb7fc5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853426

Change-Id: Ifb7a0186a73913b9d8c88f5c97a9ac116cf0ffc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-30 23:53:34 +00:00
David Srbecky
0cc9d2673f Merge "Revert^2 "Enable dex container (DEX v41) for the whole system"" into main am: 8e1efb7fc5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853426

Change-Id: I9f247846eb500eeee8cadae6e8f6b2cd9dc58aa8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-30 23:42:04 +00:00
Yu Liu
cc50163805 Merge "Add container property to aconfig_declarations." into main am: 9dc6b1025d am: affccf97fc am: 2c5e2fa470
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2835990

Change-Id: I11e0a4f614c8546353bae39c966677ca341d7811
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-30 23:24:31 +00:00
Matthew Maurer
15675d5936 rust: Enable ELF TLS by default in platform Rust
Upstream currently uses pthread keys to emulate TLS on Android because
it historically did not have it, and is going to move to LLVM emulated
TLS, which is needed to target L. Since we know the platform is Q+, we
can just use the new features.

Test: Treehugger
Change-Id: I7c7747d89cba736377cfeb4080573a89b801e8fe
2023-11-30 23:12:55 +00:00
Yu Liu
2c5e2fa470 Merge "Add container property to aconfig_declarations." into main am: 9dc6b1025d am: affccf97fc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2835990

Change-Id: I2f3fee890f10e9c2765892c33d123ad008c67810
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-30 23:09:16 +00:00
Yu Liu
01b9a3cfc9 Merge "Add container property to aconfig_declarations." into main am: 9dc6b1025d am: 4d6d371aee am: 34b5c38c44
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2835990

Change-Id: Ibeed93cf217168eeecf9568d1c3c3a5ee568327f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-30 23:07:44 +00:00
Cole Faust
b5bfebf19b Sandbox libcore-non-cts-tests-txt
Bug: 307824623
Test: m sandbox_libcore-non-cts-tests-txt and diffed the files before/after
Change-Id: If564e438d1e886419e435e24f52e0f0e2ec479d2
2023-11-30 14:53:21 -08:00
David Srbecky
8e1efb7fc5 Merge "Revert^2 "Enable dex container (DEX v41) for the whole system"" into main 2023-11-30 22:50:55 +00:00