Commit Graph

58862 Commits

Author SHA1 Message Date
Kousik Kumar
1a3e516781 [automerger skipped] Pass along local resource fraction to reproxy am: dbc313375a am: 0db3027fb7 -s ours
am skip reason: Merged-In I118bc10109f5a55df7a6c1ecd79499320055f2ed with SHA-1 35faaef43e is already in history

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

Change-Id: Id2282f6f1150c29c6297c216181ccd933e8e9c28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 18:29:35 +00:00
Kousik Kumar
f3d2edfd4b Do not dump metrics if reproxy was never started am: 5990257d46 am: 1145dd81a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049587

Change-Id: Ibdf61b445a1b6b11fb81a8021945e0a849a97a6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 18:29:33 +00:00
Kousik Kumar
3b3b252748 [automerger skipped] Do not dump metrics if reproxy was never started am: 5990257d46 am: 24a39050fd -s ours
am skip reason: Merged-In Ic3403331e1f4ac2c7c72fd9169aa7b82a7545c75 with SHA-1 a1d8fa9961 is already in history

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

Change-Id: I2325c832ab78efcd40b779f665f239ed26baa8d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 18:29:25 +00:00
Kousik Kumar
905d2ed5d7 [RESTRICT AUTOMERGE] Cleanup RBE logs directory am: 29cbe14265
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049589

Change-Id: Ia42f4c8b6e36db233e4dbdb660ef7bc6db8d7933
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 18:03:26 +00:00
Kousik Kumar
3f87c8cd8b Pass along local resource fraction to reproxy am: dbc313375a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049588

Change-Id: Ife8306fa56df31d9c023436d32765fbe14fbff22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 18:03:11 +00:00
Kousik Kumar
1145dd81a7 Do not dump metrics if reproxy was never started am: 5990257d46
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049587

Change-Id: I814eaefcad669f9dcdf723e857815cbfa1c44ff7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 18:02:56 +00:00
Kousik Kumar
b8a8d8bb2c [RESTRICT AUTOMERGE] Cleanup RBE logs directory am: 29cbe14265
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049589

Change-Id: I0124f015b9c9d1abc829b54fb29549599d58b0df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 18:02:24 +00:00
Kousik Kumar
0db3027fb7 Pass along local resource fraction to reproxy am: dbc313375a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049588

Change-Id: If103a5d9b9d2a8e544d7aab8b6120fd6dad190a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 18:02:09 +00:00
Kousik Kumar
24a39050fd Do not dump metrics if reproxy was never started am: 5990257d46
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049587

Change-Id: I1e87a465acf447336183df58ffb2c4e21371fcb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 18:01:54 +00:00
Vinh Tran
670478ee98 Merge "Replace API level codename with number" am: dd3ea92609 am: 61c55273cb am: b82c2cb3d5 am: 31b282af93
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2135992

Change-Id: Ie62ecc31ef5b9e793b45f42633f87bc53495453e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 15:48:16 +00:00
Vinh Tran
31b282af93 Merge "Replace API level codename with number" am: dd3ea92609 am: 61c55273cb am: b82c2cb3d5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2135992

Change-Id: I0d8e39042950bb8e946c23bb1a01c5e064691d06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 15:22:10 +00:00
Vinh Tran
b82c2cb3d5 Merge "Replace API level codename with number" am: dd3ea92609 am: 61c55273cb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2135992

Change-Id: If345291bec7a76ab8dd00e7f7b81547aef515d48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 14:54:38 +00:00
Ivan Lozano
06df6b1c99 Merge "rust: Allow rust_ffi_shared in jni_libs" am: 3742d6ad9e am: b3123979d2 am: 251e985c08 am: e426d898d2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2136889

Change-Id: I8a0b71ceda7ffe158c12de9bd341f8d70543b464
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 14:52:34 +00:00
Ivan Lozano
e426d898d2 Merge "rust: Allow rust_ffi_shared in jni_libs" am: 3742d6ad9e am: b3123979d2 am: 251e985c08
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2136889

Change-Id: I9a2926ca886af5882d98742267f48f0df8c060ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 14:13:27 +00:00
Vinh Tran
61c55273cb Merge "Replace API level codename with number" am: dd3ea92609
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2135992

Change-Id: I0765f56eae314bc392bc9470ab549bd64922a8df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 14:12:06 +00:00
Ivan Lozano
251e985c08 Merge "rust: Allow rust_ffi_shared in jni_libs" am: 3742d6ad9e am: b3123979d2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2136889

Change-Id: I9d08e2ed4e64ea9c8b4ef12cbeac10f46c776109
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 13:40:56 +00:00
Paul Duffin
b2192f3e52 Merge "Add protected_properties support in defaults modules" am: 23477d79f6 am: d19d88f945 am: 78ecfb73cc am: fb6fe64090
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2085469

Change-Id: I4699dc376feb5dae77581558ad0f3f9b358df7a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 13:39:51 +00:00
Vinh Tran
dd3ea92609 Merge "Replace API level codename with number" 2022-06-28 13:39:37 +00:00
Paul Duffin
fb6fe64090 Merge "Add protected_properties support in defaults modules" am: 23477d79f6 am: d19d88f945 am: 78ecfb73cc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2085469

Change-Id: I31b2abd4a21a69fcb7932cbffff5f11e592ae99b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 13:16:22 +00:00
Ivan Lozano
b3123979d2 Merge "rust: Allow rust_ffi_shared in jni_libs" am: 3742d6ad9e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2136889

Change-Id: Ib9d2066c0f4791b2aaa635c9775d4f7654b564de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 13:15:19 +00:00
Paul Duffin
78ecfb73cc Merge "Add protected_properties support in defaults modules" am: 23477d79f6 am: d19d88f945
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2085469

Change-Id: I2e394b29607527980f7c2f8e2e9b591605ba311e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 13:00:43 +00:00
Ivan Lozano
3742d6ad9e Merge "rust: Allow rust_ffi_shared in jni_libs" 2022-06-28 12:57:05 +00:00
Paul Duffin
d19d88f945 Merge "Add protected_properties support in defaults modules" am: 23477d79f6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2085469

Change-Id: Ib4517cf12814f24082b1880e86eda5beb0943d4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 12:24:52 +00:00
Paul Duffin
23477d79f6 Merge "Add protected_properties support in defaults modules" 2022-06-28 12:02:01 +00:00
Treehugger Robot
e481b3b7eb Merge "Move global asflags to config to share with Bazel" am: 8624baab51 am: f31263b447 am: 6357e3488f am: 5659303688
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2134932

Change-Id: I8693aa98045677af8b4c18bd22917ecf77b9f1a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 04:19:43 +00:00
Treehugger Robot
5659303688 Merge "Move global asflags to config to share with Bazel" am: 8624baab51 am: f31263b447 am: 6357e3488f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2134932

Change-Id: I4d3b7fa40b7e9dd7cc5523a57c095586faec8a00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 03:44:55 +00:00
Treehugger Robot
6357e3488f Merge "Move global asflags to config to share with Bazel" am: 8624baab51 am: f31263b447
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2134932

Change-Id: Ia6a386bbb900e315c75061a3827a8cbf9aa1e638
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 03:27:14 +00:00
Treehugger Robot
f31263b447 Merge "Move global asflags to config to share with Bazel" am: 8624baab51
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2134932

Change-Id: I45ae96d942b8ed4b582389bf50964cf9a823f405
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 03:01:13 +00:00
Treehugger Robot
8624baab51 Merge "Move global asflags to config to share with Bazel" 2022-06-28 02:34:59 +00:00
Vinh Tran
f192474a60 Replace API level codename with number
This CL fixes a bug when Soong pass `-target` with a non-digit suffix in Clang. As mentioned in b/236753843, Clang's version parsing expects to see an integer in the target string so it ignores the
S suffix.

Test: m gwp_asan_crash_handler && make sure -target is aarch64-linux-androidS instead of aarch64-linux-android31
Test: go test -run ^TestNonDigitMinSdkVersionInClangTriple$ android/soong/cc
Bug: 236753843
Change-Id: I258ecc52083dbf3471d23cf310e0ad54440f1908
2022-06-28 01:33:18 +00:00
Vinh Tran
494c918bc3 Merge "Deprecate depfile in gensrcs" am: 8d4ae9cbf5 am: b70c50ecee am: 7b90e4254d am: 52eca7a83e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2120835

Change-Id: Iffd40fe40c30a6a66c7a8e2731d0887b210430b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 22:46:04 +00:00
Vinh Tran
52eca7a83e Merge "Deprecate depfile in gensrcs" am: 8d4ae9cbf5 am: b70c50ecee am: 7b90e4254d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2120835

Change-Id: I629f0b0e55c79644f0e4c1d7a45c3c690f21981f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 22:31:07 +00:00
Vinh Tran
7b90e4254d Merge "Deprecate depfile in gensrcs" am: 8d4ae9cbf5 am: b70c50ecee
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2120835

Change-Id: I3e33725239dc7d333684660f7dd246fdb3703cfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 22:05:45 +00:00
Vinh Tran
b70c50ecee Merge "Deprecate depfile in gensrcs" am: 8d4ae9cbf5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2120835

Change-Id: Ib82d9f325ea18f29f9284ba156bb42c54df7bdad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 21:39:56 +00:00
Vinh Tran
8d4ae9cbf5 Merge "Deprecate depfile in gensrcs" 2022-06-27 21:17:27 +00:00
Colin Cross
e7cb35039e Merge "Add linux_musl arm+arm64" am: 2bce04f76f am: abda00bb3d am: 4a574add25 am: 09bd00e9dd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2134602

Change-Id: I1499c8f05f99b02cf308264c46576cd03287e348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 20:15:08 +00:00
Evgenii Stepanov
8b6828a40e Merge "Revert "Revert "Keep minimal abort when enabling integer overflow check""" am: 943cfcec8e am: a4384b71fc am: 44a4acdbf9 am: a2e260faff
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2132906

Change-Id: I3fa6ed5c9da56119cf6c76b2bce652785db3f3dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 20:14:40 +00:00
Ivan Lozano
7f67c2a665 rust: Allow rust_ffi_shared in jni_libs
Allow listing rust_ffi_shared modules as a jni_libs dependency
in conjunction with platform_api: true. This allows inclusion by
android_app modules.

Bug: 237304791
Test: android_app module builds with a rust_ffi_shared dependency.
Change-Id: I3a28e1baa522ad8f9c2aa86f1d23b19ce9f967e1
2022-06-27 16:00:26 -04:00
Colin Cross
09bd00e9dd Merge "Add linux_musl arm+arm64" am: 2bce04f76f am: abda00bb3d am: 4a574add25
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2134602

Change-Id: I990ce1662a1f3d8e84c8bfd39efc2e0495d6f15b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 19:59:39 +00:00
Colin Cross
4a574add25 Merge "Add linux_musl arm+arm64" am: 2bce04f76f am: abda00bb3d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2134602

Change-Id: I2d34c49dab8ba0fbb16d264b245b33a6f3677932
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 19:49:10 +00:00
Evgenii Stepanov
a2e260faff Merge "Revert "Revert "Keep minimal abort when enabling integer overflow check""" am: 943cfcec8e am: a4384b71fc am: 44a4acdbf9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2132906

Change-Id: If4c1b1ad4db19972d93310ae0d0510294a3e206a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 19:48:58 +00:00
Colin Cross
abda00bb3d Merge "Add linux_musl arm+arm64" am: 2bce04f76f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2134602

Change-Id: I6b260c393c5d519e1bef79dcde35bfaf4027734d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 18:52:22 +00:00
Cole Faust
ac11609e98 Merge "Allowlist bazel-built partition directories" am: 745ae265c2 am: 4d216f12db am: 4636df284f am: 0ac55cc530
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2133984

Change-Id: I0b02811125516d17758420e9d86d2d5fd3fbf072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 18:51:59 +00:00
Evgenii Stepanov
44a4acdbf9 Merge "Revert "Revert "Keep minimal abort when enabling integer overflow check""" am: 943cfcec8e am: a4384b71fc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2132906

Change-Id: Ia68101e891bec4b9f7aa32e2d1dca8f0b3bd79cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 18:44:48 +00:00
Colin Cross
2bce04f76f Merge "Add linux_musl arm+arm64" 2022-06-27 18:37:07 +00:00
Cole Faust
0ac55cc530 Merge "Allowlist bazel-built partition directories" am: 745ae265c2 am: 4d216f12db am: 4636df284f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2133984

Change-Id: I0fb47894d581a8d5c2a72c981f38e2897024cfd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 18:28:02 +00:00
Evgenii Stepanov
a4384b71fc Merge "Revert "Revert "Keep minimal abort when enabling integer overflow check""" am: 943cfcec8e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2132906

Change-Id: If215cb87d9af4db46bddbae074b369bb965d6790
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 18:26:38 +00:00
Evgenii Stepanov
943cfcec8e Merge "Revert "Revert "Keep minimal abort when enabling integer overflow check""" 2022-06-27 18:04:37 +00:00
Cole Faust
4636df284f Merge "Allowlist bazel-built partition directories" am: 745ae265c2 am: 4d216f12db
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2133984

Change-Id: Id225e33bd492e4b6aba0a364cc5d350357468494
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 18:02:24 +00:00
Cole Faust
4d216f12db Merge "Allowlist bazel-built partition directories" am: 745ae265c2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2133984

Change-Id: I46f5c76483733e094edf98f67654555d8f37a132
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 17:43:18 +00:00