Commit Graph

73000 Commits

Author SHA1 Message Date
Spandan Das
699b51c98e Merge "Add target_compatible_with for compile_multilib" into main am: 6f45900389 am: 6422e4736e am: 779445a5a2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2741496

Change-Id: Id3692b2ffb3924e09a7a0854759b6432cbc665e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 05:00:17 +00:00
Treehugger Robot
5e0033d59a Merge "Set device_platform build setting" into main am: 67d495fd04 am: b977451c18 am: e95fa9d562
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2741121

Change-Id: I77139fe700d5807a896106f8cb58099c53614881
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 04:59:47 +00:00
Spandan Das
779445a5a2 Merge "Add target_compatible_with for compile_multilib" into main am: 6f45900389 am: 6422e4736e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2741496

Change-Id: I6b8677e82cc35d3e069e46957500a75cbda2c87a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 04:12:54 +00:00
Treehugger Robot
e95fa9d562 Merge "Set device_platform build setting" into main am: 67d495fd04 am: b977451c18
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2741121

Change-Id: Id299c0389f72e68195f7113bded1cd53a6167a89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 04:12:16 +00:00
Spandan Das
6422e4736e Merge "Add target_compatible_with for compile_multilib" into main am: 6f45900389
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2741496

Change-Id: I00a0101153e945d2eb9b59e77ce559b589421fe0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 04:08:54 +00:00
Spandan Das
6f45900389 Merge "Add target_compatible_with for compile_multilib" into main 2023-09-06 03:29:26 +00:00
Treehugger Robot
b977451c18 Merge "Set device_platform build setting" into main am: 67d495fd04
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2741121

Change-Id: Iac3407fc822921bd102b09ec22400ab973ce1996
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 03:20:32 +00:00
Treehugger Robot
67d495fd04 Merge "Set device_platform build setting" into main 2023-09-06 02:44:38 +00:00
Treehugger Robot
fadd8932b2 Merge "soong: HWASan exclude path support" into main am: f3d52683a9 am: d24ed92a49 am: 3a5ed146cc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2721423

Change-Id: I5808bfc884a89aa408ee8e7c0aae011653026107
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 02:37:52 +00:00
Cole Faust
4bdf0e2af6 Merge "Add install_symlink soong module type" into main am: 88e9731502 am: 69cc0c7f20 am: 3a8f6b9b31
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2736901

Change-Id: I838db9044cad302ae20650ba4b9c4e59a77d65cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 02:35:58 +00:00
Treehugger Robot
3a5ed146cc Merge "soong: HWASan exclude path support" into main am: f3d52683a9 am: d24ed92a49
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2721423

Change-Id: I29054a1f63e3e1a819e49ecf2d96261d44b2c87e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 01:52:21 +00:00
Cole Faust
3a8f6b9b31 Merge "Add install_symlink soong module type" into main am: 88e9731502 am: 69cc0c7f20
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2736901

Change-Id: I0b583a080c88e36bf1ef97ed7ce4ba3c177cf688
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 01:50:24 +00:00
Treehugger Robot
d24ed92a49 Merge "soong: HWASan exclude path support" into main am: f3d52683a9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2721423

Change-Id: I79f0f214ed7fb87b347736b1e453a53029bac5dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 01:46:29 +00:00
Treehugger Robot
f3d52683a9 Merge "soong: HWASan exclude path support" into main 2023-09-06 01:14:12 +00:00
Treehugger Robot
f177c75e47 Merge "print module name on allowlist errors" into main am: 922e6adfd2 am: 2d7d8ba64e am: fa670eeae5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2741113

Change-Id: I6ec345aa02308018025a46e80661b4f25302d19d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 01:03:44 +00:00
Treehugger Robot
029604662c Merge "Disable rust sanitizers for linux_musl_x86" into main am: eb02c5cb7c am: a26fb66de6 am: cf2e9965d5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2741115

Change-Id: I23595c45c6ca632a10c497c5c7a7638f0ec0515d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 01:03:19 +00:00
Cole Faust
69cc0c7f20 Merge "Add install_symlink soong module type" into main am: 88e9731502
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2736901

Change-Id: Ia161c434ac377f2c71400e0a008e439495a6e31b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 01:00:51 +00:00
Spandan Das
e1cb14b240 Add target_compatible_with for compile_multilib
For explicit values of compile_multilib (e.g. 32 or 64), add an
incompatibilty constraint for the arches that do not have the correct
bitness.

Test: go test ./bp2build
Bug: 299135307
Change-Id: I4cd997de6804a5c6d89086d740f773936db1cab9
2023-09-06 00:31:00 +00:00
Treehugger Robot
fa670eeae5 Merge "print module name on allowlist errors" into main am: 922e6adfd2 am: 2d7d8ba64e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2741113

Change-Id: Ia668d49fa937857d9017d9f20655735fd3175b51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 00:18:36 +00:00
Treehugger Robot
cf2e9965d5 Merge "Disable rust sanitizers for linux_musl_x86" into main am: eb02c5cb7c am: a26fb66de6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2741115

Change-Id: I0d8115b08568f0c8d8e377117517c7484acd0f95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 00:18:04 +00:00
Cole Faust
88e9731502 Merge "Add install_symlink soong module type" into main 2023-09-06 00:15:09 +00:00
Treehugger Robot
9b3aa8b96e Merge "Stop NinjaReader from sending new status messages after Close" into main am: 93873cd713 am: b7eb7b0080 am: 4712e21031
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2734957

Change-Id: If3e47b014b0bc7193af731276c6dd69e54eda1d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 23:30:58 +00:00
Treehugger Robot
12dd72baa0 Merge "Enable -Wmultichar." into main am: ca22dfb5d1 am: eeb8a8c5c2 am: 7d5c092a37
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2737953

Change-Id: I13e81277db90bb0fed8630a3dc8367e1689e523c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 23:29:47 +00:00
Treehugger Robot
2d7d8ba64e Merge "print module name on allowlist errors" into main am: 922e6adfd2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2741113

Change-Id: I6268a24db2245e864fad8342a92738fbd01a6f1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 23:27:24 +00:00
Treehugger Robot
a26fb66de6 Merge "Disable rust sanitizers for linux_musl_x86" into main am: eb02c5cb7c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2741115

Change-Id: I5e70344b3fa0a96bdf41e4234f985fb400857ba3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 23:26:54 +00:00
Treehugger Robot
922e6adfd2 Merge "print module name on allowlist errors" into main 2023-09-05 23:26:31 +00:00
Cole Faust
48ce137e11 Set device_platform build setting
Fixes: 290716626
Test: b test //platform_testing/tests/example/native:hello_world_test
Change-Id: If397710e986ac1fa8b49aeb25b7342acd1eef482
2023-09-05 16:07:49 -07:00
Treehugger Robot
eb02c5cb7c Merge "Disable rust sanitizers for linux_musl_x86" into main 2023-09-05 22:56:17 +00:00
Treehugger Robot
4712e21031 Merge "Stop NinjaReader from sending new status messages after Close" into main am: 93873cd713 am: b7eb7b0080
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2734957

Change-Id: I9ad2833617ff466aacdbfc635a8d1a7afd803333
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 22:47:09 +00:00
Treehugger Robot
7d5c092a37 Merge "Enable -Wmultichar." into main am: ca22dfb5d1 am: eeb8a8c5c2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2737953

Change-Id: I796a3bbd93adf5f69e5a4f01308044335362bb0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 22:45:53 +00:00
Treehugger Robot
b7eb7b0080 Merge "Stop NinjaReader from sending new status messages after Close" into main am: 93873cd713
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2734957

Change-Id: I77ac3a3dd30bb614d3cc6bfa29f6bfd7dfe9ca77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 22:41:45 +00:00
Treehugger Robot
93873cd713 Merge "Stop NinjaReader from sending new status messages after Close" into main 2023-09-05 22:00:29 +00:00
Treehugger Robot
eeb8a8c5c2 Merge "Enable -Wmultichar." into main am: ca22dfb5d1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2737953

Change-Id: If913bc1d7a29c9e96a66c9d1629319194ec308ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 21:57:53 +00:00
Treehugger Robot
ca22dfb5d1 Merge "Enable -Wmultichar." into main 2023-09-05 21:17:21 +00:00
Treehugger Robot
9e722d2d90 [automerger skipped] Merge "Skip UP1A.230905.019" into aosp-main-future am: e125059d99 -s ours am: 872e764daf -s ours
am skip reason: Merged-In Id8002042f607f8e158f561ca47e0a84a8b8927e2 with SHA-1 b68bfc65d8 is already in history

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

Change-Id: If4d4d39a3ea6588340201333ab9ac18c83331067
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 20:44:39 +00:00
Xin Li
1a09cbc931 [automerger skipped] Skip UP1A.230905.019 am: f4b16b238b -s ours am: 61e9c9ba0b -s ours
am skip reason: Merged-In Id8002042f607f8e158f561ca47e0a84a8b8927e2 with SHA-1 b68bfc65d8 is already in history

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

Change-Id: I610c3b40e91a13cfb9000a4ff251fab0f5e13998
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 20:44:23 +00:00
Yu Liu
61f4802e91 Merge "Support include/exclude paths for memtag_heap." into main am: 267dd3bea7 am: c8ab80ae76 am: 493684356a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2736893

Change-Id: If8c5d8e546189544301a79cf322ace15af0a7a79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 20:42:27 +00:00
Liz Kammer
416f0f0b2b Merge "Add rust bp2build tests to soong tests" into main am: 3ec36ada2c am: 4e14a9ba2a am: ef50bb53b1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2735816

Change-Id: I0e308935daff31fe28790f263af0aa0455587cd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 20:42:13 +00:00
Treehugger Robot
265fd08e02 Merge "Update OWNERS file for actual Android LLVM members." into main am: ec6f10f648 am: fa9db383fe am: e821a4e651
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2736850

Change-Id: I7bdafc6895ebef713af5bf06db8dd9c3b64d7e54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 20:42:01 +00:00
Spandan Das
b3a5bfac44 Merge "Fix target_compatible_with non-determinism for proto.include_dirs" into main am: 67dc28a93d am: b527a6aa82 am: 5fc61c6f84
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2736900

Change-Id: I2d9db36d2fe0cfc4e25c45f772ab49af98998a74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 20:41:45 +00:00
Treehugger Robot
872e764daf [automerger skipped] Merge "Skip UP1A.230905.019" into aosp-main-future am: e125059d99 -s ours
am skip reason: Merged-In Id8002042f607f8e158f561ca47e0a84a8b8927e2 with SHA-1 b68bfc65d8 is already in history

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

Change-Id: I9fe91e379a865b9acd9985192a1aeffbb2054737
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 20:31:55 +00:00
Xin Li
61e9c9ba0b [automerger skipped] Skip UP1A.230905.019 am: f4b16b238b -s ours
am skip reason: Merged-In Id8002042f607f8e158f561ca47e0a84a8b8927e2 with SHA-1 b68bfc65d8 is already in history

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

Change-Id: I4e75c8b54cc97508d96b26822e942d77451828c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 20:31:38 +00:00
Treehugger Robot
e125059d99 Merge "Skip UP1A.230905.019" into aosp-main-future 2023-09-05 19:54:47 +00:00
Yu Liu
493684356a Merge "Support include/exclude paths for memtag_heap." into main am: 267dd3bea7 am: c8ab80ae76
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2736893

Change-Id: I88def0fd44a3d1a4d5e63502912f42589680a45e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 19:54:10 +00:00
Liz Kammer
ef50bb53b1 Merge "Add rust bp2build tests to soong tests" into main am: 3ec36ada2c am: 4e14a9ba2a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2735816

Change-Id: I16cd5f9b807aa4e8a793cc75f4af685dad7f6903
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 19:53:55 +00:00
Treehugger Robot
e821a4e651 Merge "Update OWNERS file for actual Android LLVM members." into main am: ec6f10f648 am: fa9db383fe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2736850

Change-Id: I1144a33c3b55fe7ef69722e685f3dc58defc1257
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 19:53:42 +00:00
Spandan Das
5fc61c6f84 Merge "Fix target_compatible_with non-determinism for proto.include_dirs" into main am: 67dc28a93d am: b527a6aa82
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2736900

Change-Id: I35011c97055552d5dad13a00eab816d792691c4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 19:53:25 +00:00
Sam Delmerico
e42edc369c print module name on allowlist errors
Change-Id: I34db128d96f8121fed56588a5d6ba7de6e848c9a
2023-09-05 19:19:19 +00:00
Colin Cross
3ef9285ed2 Disable rust sanitizers for linux_musl_x86
rustc 1.71.0 doesn't support any sanitizers for linux_musl_x86, disable
sanitizing for now.

Bug: 257334542
Test: m USE_HOST_MUSL=true host-native
Change-Id: I70819d2175c59bca1ff385d4aee48518d6b702e7
2023-09-05 12:10:54 -07:00
Colin Cross
b0b369c4fa Stop NinjaReader from sending new status messages after Close
If NinjsReader keeps sending tool status messages after Close has been
called it can cause a concurrent map access when
CriticalPath.WriteToMetrics is called concurrently with
CriticalPath.FinishAction.  Try harder to stop the NinjaReader goroutine
when NinjaReader.Close is called, even if the external ninja process has
not closed its FIFO or NinjaReader has not finished processing all the
messages after 5 seconds.

Bug: 286382228
Test: m nothing
Change-Id: I3e3dce601510e2dfb5ed82ca55bd11723fac7e70
2023-09-05 11:11:29 -07:00