Colin Cross
af4fc302a5
Merge "Shard srcjars when sharding javac compilation" into main am: b983ceac33 am: 9a21f40742 am: e693d617c2 am: 9932c623cb am: ea2a6d3715
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762551
Change-Id: I0cad47c61dfb58ba2cb3df1d27a548ad0f7a6667
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 22:32:14 +00:00
Jihoon Kang
948d775d19
Merge "Import make variable NextReleaseHideFlaggedApi to Soong" into main am: e4bb4d4e6b am: 9e613388e3 am: 94f35434bf am: a8e6f67098 am: ca7422b0b5
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755309
Change-Id: Idcc333efd4008cd3144a394c95825c360088b2e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 22:31:22 +00:00
Treehugger Robot
0771b9eb1a
Merge "Add system/tools/hidl to allowlist" into main am: 7c02986d60 am: 9a53950763 am: afb6b4c392 am: e2fefbd005 am: ff700afc2f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744701
Change-Id: Ie56a0238170c57388e2600632874c093fbed131d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 22:30:18 +00:00
Colin Cross
ea2a6d3715
Merge "Shard srcjars when sharding javac compilation" into main am: b983ceac33 am: 9a21f40742 am: e693d617c2 am: 9932c623cb
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762551
Change-Id: I74d88783b0b58d6cded324cb5b5199bd77ca719f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 21:24:42 +00:00
Jihoon Kang
ca7422b0b5
Merge "Import make variable NextReleaseHideFlaggedApi to Soong" into main am: e4bb4d4e6b am: 9e613388e3 am: 94f35434bf am: a8e6f67098
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755309
Change-Id: If0d33dba0f43f3ea62e4c1af68613f189b0dcfc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 21:24:10 +00:00
Treehugger Robot
ff700afc2f
Merge "Add system/tools/hidl to allowlist" into main am: 7c02986d60 am: 9a53950763 am: afb6b4c392 am: e2fefbd005
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744701
Change-Id: I9c83301d4331dc909663803e0174deeb1803d6e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 21:23:12 +00:00
Colin Cross
9932c623cb
Merge "Shard srcjars when sharding javac compilation" into main am: b983ceac33 am: 9a21f40742 am: e693d617c2
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762551
Change-Id: I299a5aa429184b63d624172a1ab6d0bb393a53a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 20:41:42 +00:00
Jihoon Kang
a8e6f67098
Merge "Import make variable NextReleaseHideFlaggedApi to Soong" into main am: e4bb4d4e6b am: 9e613388e3 am: 94f35434bf
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755309
Change-Id: If2f2b41e1f1d46e9aa3cd89c7e85fbea9a627029
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 20:40:59 +00:00
Treehugger Robot
e2fefbd005
Merge "Add system/tools/hidl to allowlist" into main am: 7c02986d60 am: 9a53950763 am: afb6b4c392
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744701
Change-Id: Ie7084489b06f8d59a55f6939e4fd4b60041a9029
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 20:40:49 +00:00
Treehugger Robot
6320d21203
Merge "Improve optimize bp2build conditional." into main am: 8559872623 am: 6c49c4a1d5 am: 36b815461a am: d75588773b am: c264f981d6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762806
Change-Id: I419234a25d55240978ac0c6be7a0b4627ff956cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 20:40:09 +00:00
Colin Cross
e693d617c2
Merge "Shard srcjars when sharding javac compilation" into main am: b983ceac33 am: 9a21f40742
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762551
Change-Id: Iab092236065583a885abddac58505e0ff79a66ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 19:20:40 +00:00
Jihoon Kang
94f35434bf
Merge "Import make variable NextReleaseHideFlaggedApi to Soong" into main am: e4bb4d4e6b am: 9e613388e3
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755309
Change-Id: Id1c1181c38edd50597826483909e7cf6fb2d7c20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 19:19:18 +00:00
Treehugger Robot
afb6b4c392
Merge "Add system/tools/hidl to allowlist" into main am: 7c02986d60 am: 9a53950763
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744701
Change-Id: Ib0b231c59ad535c7d03993ba3525e5efc7775ae5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 19:19:09 +00:00
Treehugger Robot
c264f981d6
Merge "Improve optimize bp2build conditional." into main am: 8559872623 am: 6c49c4a1d5 am: 36b815461a am: d75588773b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762806
Change-Id: I7b84a024363c10abe56a07f1c0069fd38f52f8ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 19:05:00 +00:00
Treehugger Robot
d75588773b
Merge "Improve optimize bp2build conditional." into main am: 8559872623 am: 6c49c4a1d5 am: 36b815461a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762806
Change-Id: I49e1754c9499d309c5b7e5f553400016c0d4c5cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 18:24:08 +00:00
Colin Cross
9a21f40742
Merge "Shard srcjars when sharding javac compilation" into main am: b983ceac33
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762551
Change-Id: I0844a841887d964530f33a99e8fa1469c13d71d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 18:21:49 +00:00
Anton Hansson
8482c5432e
Make package parsing code consume annotations am: 2863e4535e am: aeb979e000 am: 7ba5d61fde am: ad908b4efb am: 84679dd2af
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760406
Change-Id: I56aab989f8f8ca76476e6673e05ef5cb5911cb70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 18:21:16 +00:00
Jihoon Kang
9e613388e3
Merge "Import make variable NextReleaseHideFlaggedApi to Soong" into main am: e4bb4d4e6b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755309
Change-Id: I9416a1016d8fe652db6c40ef5470ee46621e054b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 18:20:33 +00:00
Treehugger Robot
9a53950763
Merge "Add system/tools/hidl to allowlist" into main am: 7c02986d60
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744701
Change-Id: I27eb891fe323c5699ff2fa64ac9baa8ecab8e77b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 18:20:19 +00:00
Colin Cross
b983ceac33
Merge "Shard srcjars when sharding javac compilation" into main
2023-09-26 18:01:49 +00:00
Jihoon Kang
e4bb4d4e6b
Merge "Import make variable NextReleaseHideFlaggedApi to Soong" into main
2023-09-26 17:49:25 +00:00
Treehugger Robot
36b815461a
Merge "Improve optimize bp2build conditional." into main am: 8559872623 am: 6c49c4a1d5
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762806
Change-Id: Ib480e7bf5525173b01ae47846cd721e5c992fd3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 17:00:16 +00:00
Treehugger Robot
7c02986d60
Merge "Add system/tools/hidl to allowlist" into main
2023-09-26 16:59:03 +00:00
Anton Hansson
84679dd2af
Make package parsing code consume annotations am: 2863e4535e am: aeb979e000 am: 7ba5d61fde am: ad908b4efb
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760406
Change-Id: I94aca80fecae8f99fb9828ec7e0a8b5c437ec7b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 16:46:09 +00:00
Anton Hansson
ad908b4efb
Make package parsing code consume annotations am: 2863e4535e am: aeb979e000 am: 7ba5d61fde
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760406
Change-Id: I1aaa861fcac61da6c0146834c63822ae307f2793
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 16:04:05 +00:00
Treehugger Robot
6c49c4a1d5
Merge "Improve optimize bp2build conditional." into main am: 8559872623
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762806
Change-Id: I4493c3fbcfa9f42509cd8a641293eabe91ec8475
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 15:59:55 +00:00
Treehugger Robot
8559872623
Merge "Improve optimize bp2build conditional." into main
2023-09-26 15:23:20 +00:00
Anton Hansson
7ba5d61fde
Make package parsing code consume annotations am: 2863e4535e am: aeb979e000
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760406
Change-Id: Id3c3c16c0425a17357c94fecbb2642a43c1921be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 15:10:27 +00:00
Anton Hansson
aeb979e000
Make package parsing code consume annotations am: 2863e4535e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760406
Change-Id: I6441efbe49bd65f72d952bc8d65519dd2a286952
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 14:11:39 +00:00
Anton Hansson
2863e4535e
Make package parsing code consume annotations
...
The code previously assumed an annotation meant there was no package
declaration, but package declarations can be annotated. Update the
code to consume any leading annotations.
Bug: 151360309
Test: jar_test.go (& manual verification on full bootclasspath srcs)
Change-Id: I3de5a2a675363fc3627a278103dd2cabe80a2d80
2023-09-26 09:55:52 +00:00
Treehugger Robot
4e7dd7e320
Merge "Generate a ndk_sysroot target in bp2build" into main am: 370e34172f am: 354f87f135 am: 8de87e277e am: 47cb3481cc am: f5649b66fc
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756530
Change-Id: If022ea37a625ddfbb7c5c1e22ab54ae09f1b48e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 08:41:13 +00:00
Jingwen Chen
3ec34d74a7
Allowlist system/core/libstats/expresslog am: c6f3c10615 am: e14b481913 am: 09d8de8b0d am: 023959e3c6 am: a21f382fd9
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762805
Change-Id: I38431cebb184aae4f8bfe3a51d7cb55e1c168fec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 08:40:43 +00:00
Treehugger Robot
f5649b66fc
Merge "Generate a ndk_sysroot target in bp2build" into main am: 370e34172f am: 354f87f135 am: 8de87e277e am: 47cb3481cc
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756530
Change-Id: Ic3d4dce8fd931ac84e49392ac3fee797d0f4128d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 07:35:33 +00:00
Jingwen Chen
a21f382fd9
Allowlist system/core/libstats/expresslog am: c6f3c10615 am: e14b481913 am: 09d8de8b0d am: 023959e3c6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762805
Change-Id: I5cd1bdece81657371c2ee76f57182059cfa9d153
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 07:35:24 +00:00
Treehugger Robot
47cb3481cc
Merge "Generate a ndk_sysroot target in bp2build" into main am: 370e34172f am: 354f87f135 am: 8de87e277e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756530
Change-Id: Ia76f1a002ae3ebfccc06971d23209883ca75f8ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 06:53:48 +00:00
Jingwen Chen
023959e3c6
Allowlist system/core/libstats/expresslog am: c6f3c10615 am: e14b481913 am: 09d8de8b0d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762805
Change-Id: I73b1235b87eba7eb259154de9819066a48c64b0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 06:53:39 +00:00
Treehugger Robot
8de87e277e
Merge "Generate a ndk_sysroot target in bp2build" into main am: 370e34172f am: 354f87f135
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756530
Change-Id: I6db38df04de6335a912df9da0490bd4015f04776
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 06:00:45 +00:00
Jingwen Chen
09d8de8b0d
Allowlist system/core/libstats/expresslog am: c6f3c10615 am: e14b481913
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762805
Change-Id: I202c680c410c52acabe3c0dd8488d87d39abd0b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 06:00:19 +00:00
Jingwen Chen
256c389608
Improve optimize bp2build conditional.
...
Follow up from https://android-review.git.corp.google.com/c/platform/build/soong/+/2757255/comment/fdcf5795_943a04d5/
Test: soong unit tests
Change-Id: I63334bfd19469060673e9a9a239050590934b089
2023-09-26 05:56:54 +00:00
Treehugger Robot
354f87f135
Merge "Generate a ndk_sysroot target in bp2build" into main am: 370e34172f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756530
Change-Id: Icec90aea97b644dc76d16009c5132681b82b4d20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 05:55:30 +00:00
Treehugger Robot
370e34172f
Merge "Generate a ndk_sysroot target in bp2build" into main
2023-09-26 05:16:53 +00:00
Treehugger Robot
e025935626
Merge "Add bp2build for rust_protobuf module" into main am: 0c0b0d6857 am: 0c35a98fed am: 75f1ef4a1a am: fac4e6b97e am: a4a110f531
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757770
Change-Id: Ifdd59554a6829730d26628e4defb84c855ad48be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 05:04:52 +00:00
Treehugger Robot
2f5f225d3e
Merge "Skip snapshot for sanitizer variants with both cfi and hwasan" into main am: b5a1bbffda am: 3242266a8e am: cdd053d96e am: a7ae4a45af am: 59210990a1
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2761547
Change-Id: Ia3a28c29794adcd52c3a6422e8bd92260041c7e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 05:04:04 +00:00
Jingwen Chen
e14b481913
Allowlist system/core/libstats/expresslog am: c6f3c10615
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762805
Change-Id: I48517210dd37efa1cd1aab709487e4887a7d5334
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 05:01:27 +00:00
Colin Cross
a052ddbb7e
Shard srcjars when sharding javac compilation
...
java_library rules with javac_shard_size set split the sources into
shards to invoke javac multiple times, but were using a single javac
invocation for all srcjars. For fraemwork-minus-apex, this srcjar
shard was the long pole at 15.7 seconds, containing 266 srcjars with
1542 java files with a total of 614593 lines.
Use a rough approximation of 5 sources per srcjar to determine the
number of shards to split the srcjars into based on javac_shard_size.
This results in splitting the srcjars for frameworks-minus-apex into
8 shards, with the longest taking 10.5 seconds to compile.
The longest shard contains most of the aidl srcjars, which have been
generated by sharded groups of 50 aidl files and have a much higher
average number of sources per srcjar (a mean and median of 27). A
future improvement could be to shard those separately assuming a
higher number of sources per srcjar.
Bug: 302033097
Test: USE_RBE=false m frameworks-minus-apex
Change-Id: I85e740c7fcf5651cf18c0cdc90ab8c6ee39cb47b
2023-09-25 21:46:58 -07:00
Treehugger Robot
a4a110f531
Merge "Add bp2build for rust_protobuf module" into main am: 0c0b0d6857 am: 0c35a98fed am: 75f1ef4a1a am: fac4e6b97e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757770
Change-Id: I26a429b03fc3ec307603f2da21f7ae0b989e2687
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 03:59:16 +00:00
Treehugger Robot
59210990a1
Merge "Skip snapshot for sanitizer variants with both cfi and hwasan" into main am: b5a1bbffda am: 3242266a8e am: cdd053d96e am: a7ae4a45af
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2761547
Change-Id: Ie17debb0a591662d4864c93acce13d28244f2278
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 03:57:50 +00:00
Treehugger Robot
fac4e6b97e
Merge "Add bp2build for rust_protobuf module" into main am: 0c0b0d6857 am: 0c35a98fed am: 75f1ef4a1a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757770
Change-Id: Ifd0946fa8e9c0b9a96c1915ddd7380c811c07b40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 03:17:29 +00:00
Treehugger Robot
a7ae4a45af
Merge "Skip snapshot for sanitizer variants with both cfi and hwasan" into main am: b5a1bbffda am: 3242266a8e am: cdd053d96e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2761547
Change-Id: Ifc5522d987343999685c211c8951bca9d53f48fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 03:17:10 +00:00
Jihoon Kang
8aa5075522
Merge changes from topics "remove_api_files", "remove_naming_convention" into main am: 534e2e504d am: 426d016353 am: 1eaf6404ab am: 3f2880d220 am: 6c54015e4a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2758365
Change-Id: I5b63aad96dad5f7a2927babd7238f7ffded8b1c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 03:14:52 +00:00