Commit Graph

77098 Commits

Author SHA1 Message Date
Colin Cross
602e7436cb Merge "Add TestContext parameter to ContentFromFileRuleForTests" into main am: 2998c33d43 am: e4f28b5a03
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2817720

Change-Id: I2d072a53e04a05e59072b22f9bdb1b7857b8508a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 01:42:26 +00:00
Colin Cross
e4f28b5a03 Merge "Add TestContext parameter to ContentFromFileRuleForTests" into main am: 2998c33d43
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2817720

Change-Id: If970d7ed844d01913dae37cf1398248714775814
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 01:09:37 +00:00
Colin Cross
2998c33d43 Merge "Add TestContext parameter to ContentFromFileRuleForTests" into main 2023-12-05 00:29:10 +00:00
Elliott Hughes
1f4c37ceda riscv64: disable a weird option. am: bee01f7d62 am: db91ef7070
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853594

Change-Id: Ie4a8f22cc8fa95014655672118871db6acf18980
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04 17:38:32 +00:00
Elliott Hughes
cfed7e53cf riscv64: disable a weird option. am: bee01f7d62 am: 3465d10154
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853594

Change-Id: I2ce807bd9332721bba466731cae45c52a16f4508
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04 17:24:34 +00:00
Elliott Hughes
db91ef7070 riscv64: disable a weird option. am: bee01f7d62
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853594

Change-Id: Icc74914bd257d0011a01920be031e9a8ca6fa498
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04 17:04:50 +00:00
Elliott Hughes
3465d10154 riscv64: disable a weird option. am: bee01f7d62
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853594

Change-Id: I5d38048a2be038b68f19df318e215c1c4d468b85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04 16:52:42 +00:00
Colin Cross
f61d03d241 Add TestContext parameter to ContentFromFileRuleForTests
The next CL will need a TestContext parameter in
ContentFromFileRuleForTests in order to retrieve the file rule contents
from the Config.  Add it and update all the tests that use it in order
to simply review of the next CL.

Bug: 306029038
Test: go test ./...
Change-Id: Ia4b4c9854017ea3472fa2f8ba42cf7f72720496e
2023-12-03 17:22:56 -08:00
Elliott Hughes
bee01f7d62 riscv64: disable a weird option.
By default clang assumes that on riscv64 jumps are really expensive.
That's probably not true for the kind of SoCs we're dealing with, but
more importantly (see the bug) it causes clang to do loads from the
right hand side of a `&&` before the left hand side has been evaluated.
This found one latent bug in libcore, and it doesn't seem like the best
use of anyone's time to have to chase similar issues if they're going
to be similarly latent for riscv64 when we get clang's default fixed.

Bug: https://github.com/google/android-riscv64/issues/124
Test: treehugger
Change-Id: I640f1b43ea3d2452366ab86e97a9189fa9f5326c
2023-12-01 17:39:20 -08:00
Elliott Hughes
d5402d7796 Merge "riscv64: stop explicitly disabling emutls." into main am: 198583ed20 am: 7114430368
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2855429

Change-Id: I53b1f850acb1f000d4b4713f78b3324cfe7d8bd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 22:23:09 +00:00
Elliott Hughes
87939abd39 Merge "riscv64: stop explicitly disabling emutls." into main am: 198583ed20 am: 2c2dd13e64
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2855429

Change-Id: I916f2fbf0365b529c8eb711be847516b8aa813fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 22:04:28 +00:00
Elliott Hughes
2c2dd13e64 Merge "riscv64: stop explicitly disabling emutls." into main am: 198583ed20
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2855429

Change-Id: I7b08bc843b215cc61adfe3477338d3d5af32a62c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 21:25:36 +00:00
Elliott Hughes
7114430368 Merge "riscv64: stop explicitly disabling emutls." into main am: 198583ed20
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2855429

Change-Id: I39a7c1c8db0eb4bfb9886feb1deb8da44a2eee45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 21:25:13 +00:00
Elliott Hughes
198583ed20 Merge "riscv64: stop explicitly disabling emutls." into main 2023-12-01 20:28:09 +00:00
Colin Cross
907d9581db Merge "Move test data installation to Soong" into main am: 0d5dd390c6 am: 8e29cb335a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2834993

Change-Id: I8fa93f88d3c44632729283e7035e0ff18e94b887
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 19:59:50 +00:00
Colin Cross
0c714ca959 Merge "Update go.mod and go.work to 1.21" into main am: 64823ec0be am: 73edbcac5b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2855212

Change-Id: Ib8ed3fb96a2b90354902be0878ce04a0947a22de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 19:57:50 +00:00
Colin Cross
f8c3d2f72e Merge "Move test data installation to Soong" into main am: 0d5dd390c6 am: 5eaf8b8e73
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2834993

Change-Id: Ia15e3eb0b1d8086fead5b0c872fde833af2f5d2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 19:57:02 +00:00
Colin Cross
6f4a28fa5b Merge "Update go.mod and go.work to 1.21" into main am: 64823ec0be am: 0b3a2a4ba6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2855212

Change-Id: I9ac8e2752c78eea2300598e7aa4c746dac760e9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 19:56:54 +00:00
Cole Faust
9eb58d2079 Merge "Sandbox libcore-non-cts-tests-txt" into main am: d3fea22835 am: 2dddaa3246
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2854024

Change-Id: I9088165fbf5849639d38bdff8b548830112b55a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 19:56:39 +00:00
Colin Cross
8e29cb335a Merge "Move test data installation to Soong" into main am: 0d5dd390c6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2834993

Change-Id: Ica27a4663b0e9440b9441f72a20e994f1fb869bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 19:35:37 +00:00
Cole Faust
e3292fdda2 Merge "Sandbox libcore-non-cts-tests-txt" into main am: d3fea22835 am: dee969296e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2854024

Change-Id: I543d52b5dbe62e3704efe6b4e8e9bf497f820880
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 19:26:35 +00:00
Colin Cross
73edbcac5b Merge "Update go.mod and go.work to 1.21" into main am: 64823ec0be
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2855212

Change-Id: Ide4619884760e3b49b2453a80348519ba1479d23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 19:22:59 +00:00
Colin Cross
5eaf8b8e73 Merge "Move test data installation to Soong" into main am: 0d5dd390c6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2834993

Change-Id: Iee89813f724b6a593f2d26d9d235582ee3a8cf2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 19:22:40 +00:00
Cole Faust
dee969296e 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: Ife700cedfd0bd9fed890d1773e789a1f1a3cd52a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 19:22:04 +00:00
Colin Cross
0b3a2a4ba6 Merge "Update go.mod and go.work to 1.21" into main am: 64823ec0be
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2855212

Change-Id: I7ebc3a369f7b7b5f692eb520c970792fa15631c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 19:21:35 +00:00
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
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
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