Colin Cross
0b6b095c7f
Merge "Use depsets for transitive manifests and assets" into main am: 654f176379
am: b54cec3cb9
am: 44891a09ac
am: 5bf41f6f96
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2633850
Change-Id: I56a21eeedb7c130b4346fa27233c83bac5d049e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 00:57:25 +00:00
Vadim Spivak
999465e04d
Merge "AIDEGen: Collect apt generated sources" into main am: 7a2e48bd36
am: 0f9737719e
am: 8303ac5f5f
am: c38550c945
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2620724
Change-Id: I3c90aaaa145ad44fefb024c38a8d1b0e848ef79f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 00:55:50 +00:00
Colin Cross
5bf41f6f96
Merge "Use depsets for transitive manifests and assets" into main am: 654f176379
am: b54cec3cb9
am: 44891a09ac
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2633850
Change-Id: I4434825dbf0a6e12669c6c1620f77ceaad876e47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 00:13:11 +00:00
Vadim Spivak
c38550c945
Merge "AIDEGen: Collect apt generated sources" into main am: 7a2e48bd36
am: 0f9737719e
am: 8303ac5f5f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2620724
Change-Id: I0c3fc967680ca6d7f3876ba20ef5dc62e91e2fc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 00:11:17 +00:00
Colin Cross
44891a09ac
Merge "Use depsets for transitive manifests and assets" into main am: 654f176379
am: b54cec3cb9
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2633850
Change-Id: I4ffe5422da8d1eadc4bcb99223850e170e1cdb11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 23:29:23 +00:00
Vadim Spivak
8303ac5f5f
Merge "AIDEGen: Collect apt generated sources" into main am: 7a2e48bd36
am: 0f9737719e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2620724
Change-Id: I79780f60f5ad97864476b49d5054a0cd58a505bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 23:28:00 +00:00
Colin Cross
b54cec3cb9
Merge "Use depsets for transitive manifests and assets" into main am: 654f176379
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2633850
Change-Id: I7b16496a65e5177edc599f6070eb1ca414087567
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 22:42:02 +00:00
Vadim Spivak
0f9737719e
Merge "AIDEGen: Collect apt generated sources" into main am: 7a2e48bd36
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2620724
Change-Id: I37daac50c8a192f49168b6b83aeddfb7e26d1404
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 22:39:58 +00:00
Colin Cross
654f176379
Merge "Use depsets for transitive manifests and assets" into main
2023-07-12 21:49:13 +00:00
Vadim Spivak
7a2e48bd36
Merge "AIDEGen: Collect apt generated sources" into main
2023-07-12 21:33:59 +00:00
Fabián Cañas
7fa16b3019
Merge "Make clang debug level configurable" into main am: 3875e1c582
am: ae53513282
am: c35754b54f
am: 1f54ab0381
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2647459
Change-Id: Iff0bff7e85d109606731a7d3d65cb2413da984e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 21:08:18 +00:00
Fabián Cañas
1f54ab0381
Merge "Make clang debug level configurable" into main am: 3875e1c582
am: ae53513282
am: c35754b54f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2647459
Change-Id: Ia20b0479866b1034386a6a4f681379a555de85f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 20:19:59 +00:00
Fabián Cañas
c35754b54f
Merge "Make clang debug level configurable" into main am: 3875e1c582
am: ae53513282
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2647459
Change-Id: I09790bce0fbbfb02c3078a727ac45c090e41a6ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 19:39:50 +00:00
Fabián Cañas
ae53513282
Merge "Make clang debug level configurable" into main am: 3875e1c582
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2647459
Change-Id: If8cc01f09d10449a783073621831dcbac5c67a66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 18:49:44 +00:00
Treehugger Robot
cdfe019437
Merge "Remove metalava --no-banner argument" into main am: 105005bfd4
am: 670694a788
am: 2fe4a979c3
am: 09f18e36d9
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2655301
Change-Id: I00400bb52bba6b2981db5a3900f593b498e8aaf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 18:38:35 +00:00
Treehugger Robot
09f18e36d9
Merge "Remove metalava --no-banner argument" into main am: 105005bfd4
am: 670694a788
am: 2fe4a979c3
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2655301
Change-Id: I544fcf4532feda664e6a7b1ada1cda8c97ede47e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 18:26:13 +00:00
Fabián Cañas
3875e1c582
Merge "Make clang debug level configurable" into main
2023-07-12 17:58:33 +00:00
Treehugger Robot
2fe4a979c3
Merge "Remove metalava --no-banner argument" into main am: 105005bfd4
am: 670694a788
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2655301
Change-Id: Ic942f25058f29ccdee45b380fa078a666470e472
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 17:43:50 +00:00
Vadim Spivak
3c496f00fa
AIDEGen: Collect apt generated sources
...
The Java compiler may generate sources when processing annotations.
These sources are currently not included in the IDE project model, which
results in unresolved symbols when using Hilt and other annotation
processors. These sources are not passed to the Java compiler for
compilation, so they cannot be handled like other Java module sources.
This change archives the generated sources and appends them to the
existing srcjar list in module_bp_java_deps.json.
Test: go test .
Test: Verified that module_bp_java_deps.json contained srcjar entry
Test: with path/to/android_common/javac/anno.srcjar.
Test: Verified that IntelliJ can resolve generated symbols after
Test: invoking aidegen.
Change-Id: I6a3011f9140fd25f785178baee0cd6074ad94600
2023-07-12 17:34:39 +00:00
Treehugger Robot
670694a788
Merge "Remove metalava --no-banner argument" into main am: 105005bfd4
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2655301
Change-Id: I95020cf42a22a58bbdacd7e04ca4fb92eb60d092
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 17:21:24 +00:00
Treehugger Robot
105005bfd4
Merge "Remove metalava --no-banner argument" into main
2023-07-12 17:08:42 +00:00
Mårten Kongstad
bd2624442b
Remove metalava --no-banner argument
...
metalava no longer prints an ASCII banner, and has removed its
--no-banner argument. Update all call sites accordingly.
Test: presubmit
Bug: 286023667
Change-Id: I61cf5f1125dfbd93496e6a59eb1ea62886b32046
2023-07-12 14:07:01 +02:00
Liz Kammer
a7b974e5d2
Merge "Ensure data is passed to all generation actions" into main am: e3c11d0aad
am: e1d018e299
am: d69cf9257c
am: d67dc07145
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2653720
Change-Id: If72bb42c19c4134539ddc87822b9701c755b8a07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 23:01:53 +00:00
Jiakai Zhang
2730d59870
Merge changes I0918f2fa,I3fc6ff91,I7adc97cb,I674a5fa1,I22c45cbf into main am: b898c112a2
am: 12e3b8adcc
am: 2c4e719839
am: eb17813c98
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2652086
Change-Id: I38043bc7d27899c0185a2b649e240047032780b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 23:01:42 +00:00
Colin Cross
69f550b18a
Merge "Add tests for code that will be affected by resource processor feature" into main am: 120b55a7ca
am: 27da704772
am: 9740d8fe41
am: 9332ab33f7
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2649208
Change-Id: I62f5eaeee1c4f17f642d78c9548d0e8aab47dfaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 23:01:31 +00:00
Liz Kammer
d67dc07145
Merge "Ensure data is passed to all generation actions" into main am: e3c11d0aad
am: e1d018e299
am: d69cf9257c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2653720
Change-Id: I9a64a188993bc0a4fbe907bec791fa76895366c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 22:18:58 +00:00
Jiakai Zhang
eb17813c98
Merge changes I0918f2fa,I3fc6ff91,I7adc97cb,I674a5fa1,I22c45cbf into main am: b898c112a2
am: 12e3b8adcc
am: 2c4e719839
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2652086
Change-Id: Ie4445ff5a276cafebbf8e8d09cba8b92646c5ed5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 22:18:46 +00:00
Colin Cross
9332ab33f7
Merge "Add tests for code that will be affected by resource processor feature" into main am: 120b55a7ca
am: 27da704772
am: 9740d8fe41
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2649208
Change-Id: I420b2644c722cefe01adaa7cab08a872a64145ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 22:18:32 +00:00
Liz Kammer
d69cf9257c
Merge "Ensure data is passed to all generation actions" into main am: e3c11d0aad
am: e1d018e299
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2653720
Change-Id: I451f2fd4025256f9e23fc3b7600e35497df41029
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 21:34:18 +00:00
Jiakai Zhang
2c4e719839
Merge changes I0918f2fa,I3fc6ff91,I7adc97cb,I674a5fa1,I22c45cbf into main am: b898c112a2
am: 12e3b8adcc
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2652086
Change-Id: Ib518d730655b2d1e6229db3f7005d57296317055
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 21:34:08 +00:00
Colin Cross
9740d8fe41
Merge "Add tests for code that will be affected by resource processor feature" into main am: 120b55a7ca
am: 27da704772
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2649208
Change-Id: Ifc548b9a2681e615076e2faa692897d6bfb88440
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 21:33:45 +00:00
Liz Kammer
e1d018e299
Merge "Ensure data is passed to all generation actions" into main am: e3c11d0aad
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2653720
Change-Id: Ide2a94bb106b74f38784eb2db07141a961135790
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 21:13:42 +00:00
Jiakai Zhang
12e3b8adcc
Merge changes I0918f2fa,I3fc6ff91,I7adc97cb,I674a5fa1,I22c45cbf into main am: b898c112a2
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2652086
Change-Id: Icb2b539c0d2868e94020cd7396aaffb4f02d79b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 21:12:44 +00:00
Liz Kammer
e3c11d0aad
Merge "Ensure data is passed to all generation actions" into main
2023-07-11 21:05:32 +00:00
Jiakai Zhang
b898c112a2
Merge changes I0918f2fa,I3fc6ff91,I7adc97cb,I674a5fa1,I22c45cbf into main
...
* changes:
Change the profile path on host.
Extract duplicate code to common helper functions.
Fix dumpOatRules.
Remove Modules() from BootclasspathFragmentApexContentInfo.
Fix some tests for dexpreopt and remove unnecessary tests.
2023-07-11 20:59:07 +00:00
Colin Cross
27da704772
Merge "Add tests for code that will be affected by resource processor feature" into main am: 120b55a7ca
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2649208
Change-Id: I99967322c62a5a770032f826e4cb49a42b96dc07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 20:48:56 +00:00
Wei Li
4ec0c4a57e
Merge "Add integration test for m build SBOM of APEXs/APKs." into main am: 1ab0564e65
am: 1a128321e3
am: 0292d222e7
am: 8621344b2c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2652824
Change-Id: I9087af4911b4618d71ff37c734cea3f1ad646ef5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 20:48:37 +00:00
Treehugger Robot
e9372c7ba4
Merge "Turn on Global ThinLTO by default" into main am: 71f5a63267
am: cad6091fc8
am: 5a73726e04
am: 609a030a85
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2200436
Change-Id: If0e4336cf750ed3264cf2b8d8b6220e035f5ee29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 20:48:25 +00:00
Treehugger Robot
e92d7044cd
Merge "Experiment with not using ninja weights" into main am: da7973112a
am: f0fa7b4edf
am: 39e844af6d
am: 44eb6cebab
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2652025
Change-Id: I5067796ba0acc964f83bf53388294a1161942da3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 20:48:00 +00:00
Colin Cross
120b55a7ca
Merge "Add tests for code that will be affected by resource processor feature" into main
2023-07-11 20:17:05 +00:00
Wei Li
8621344b2c
Merge "Add integration test for m build SBOM of APEXs/APKs." into main am: 1ab0564e65
am: 1a128321e3
am: 0292d222e7
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2652824
Change-Id: I8af240aeff7caa2e22c7346ab8fee15523ce7c91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 20:02:38 +00:00
Treehugger Robot
609a030a85
Merge "Turn on Global ThinLTO by default" into main am: 71f5a63267
am: cad6091fc8
am: 5a73726e04
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2200436
Change-Id: I2773da3626523b416258b6adf34b348300cfc34f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 20:02:24 +00:00
Treehugger Robot
44eb6cebab
Merge "Experiment with not using ninja weights" into main am: da7973112a
am: f0fa7b4edf
am: 39e844af6d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2652025
Change-Id: Ia5a8db038cd069a1306e3fe7ae225eafd0161093
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 20:02:00 +00:00
Wei Li
0292d222e7
Merge "Add integration test for m build SBOM of APEXs/APKs." into main am: 1ab0564e65
am: 1a128321e3
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2652824
Change-Id: I29a4c7f61d69e8fd0a3f466a42fc46f0562a0181
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 19:22:41 +00:00
Treehugger Robot
5a73726e04
Merge "Turn on Global ThinLTO by default" into main am: 71f5a63267
am: cad6091fc8
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2200436
Change-Id: I607d81fd67a146f3b4a436b496dc7f0c806cdadd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 19:22:31 +00:00
Treehugger Robot
39e844af6d
Merge "Experiment with not using ninja weights" into main am: da7973112a
am: f0fa7b4edf
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2652025
Change-Id: I77b18de3e965d761e95bb73174b53e460c1cafb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 19:21:21 +00:00
Wei Li
1a128321e3
Merge "Add integration test for m build SBOM of APEXs/APKs." into main am: 1ab0564e65
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2652824
Change-Id: Ieaf85e8ea018f834e9a1dc4bf122b03d857a8d9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 18:41:05 +00:00
Treehugger Robot
cad6091fc8
Merge "Turn on Global ThinLTO by default" into main am: 71f5a63267
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2200436
Change-Id: I4105caa231e8df9d9125d5680a3398028f6852f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 18:40:52 +00:00
Treehugger Robot
f0fa7b4edf
Merge "Experiment with not using ninja weights" into main am: da7973112a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2652025
Change-Id: I175897787fc69913b390dbba4be6d4e32ab85f70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 18:38:29 +00:00
Wei Li
1ab0564e65
Merge "Add integration test for m build SBOM of APEXs/APKs." into main
2023-07-11 18:25:39 +00:00