Commit Graph

73310 Commits

Author SHA1 Message Date
Jiakai Zhang
1b7fe31831 Merge changes I0918f2fa,I3fc6ff91,I7adc97cb,I674a5fa1,I22c45cbf into main am: b898c112a2 am: 12e3b8adcc am: 2c4e719839 am: eb17813c98 am: 2730d59870 am: 6b92d74d25
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2652086

Change-Id: I95939a8358ca178fff7562dabbe6d8038adcbe22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 00:52:25 +00:00
Colin Cross
fa268b116e Merge "Add tests for code that will be affected by resource processor feature" into main am: 120b55a7ca am: 27da704772 am: 9740d8fe41 am: 9332ab33f7 am: 69f550b18a am: 587538e1b8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2649208

Change-Id: Id615d02da5e0caca82cce8ade3d9cd322bc02219
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 00:50:59 +00:00
Jiakai Zhang
6b92d74d25 Merge changes I0918f2fa,I3fc6ff91,I7adc97cb,I674a5fa1,I22c45cbf into main am: b898c112a2 am: 12e3b8adcc am: 2c4e719839 am: eb17813c98 am: 2730d59870
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2652086

Change-Id: Ibe8dc870d1680786241ba0af13aed2d9ac8a7bde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 23:47:07 +00:00
Colin Cross
587538e1b8 Merge "Add tests for code that will be affected by resource processor feature" into main am: 120b55a7ca am: 27da704772 am: 9740d8fe41 am: 9332ab33f7 am: 69f550b18a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2649208

Change-Id: Ic7470ec4a0483bee94e9c344be8e61370b0c6c8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 23:46:25 +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
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
Wei Li
53fa2b5c21 Merge "Add integration test for m build SBOM of APEXs/APKs." into main am: 1ab0564e65 am: 1a128321e3 am: 0292d222e7 am: 8621344b2c am: 4ec0c4a57e am: 610372260c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2652824

Change-Id: Ie365e2cd49aa6dc5aa26bac3ed2f89c0d1952aef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 22:18:04 +00:00
Treehugger Robot
205e9e5e11 Merge "Turn on Global ThinLTO by default" into main am: 71f5a63267 am: cad6091fc8 am: 5a73726e04 am: 609a030a85 am: e9372c7ba4 am: 3d50214490
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2200436

Change-Id: I6e88e7d47dfa025fb70bacf3e1a76097a44669af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 22:17:42 +00:00
Treehugger Robot
b625e3d803 Merge "Experiment with not using ninja weights" into main am: da7973112a am: f0fa7b4edf am: 39e844af6d am: 44eb6cebab am: e92d7044cd am: a9f5243d87
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2652025

Change-Id: I0ce2e256266fffe477ce51f534bd4f1dd3102835
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 22:16:31 +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
Wei Li
610372260c Merge "Add integration test for m build SBOM of APEXs/APKs." into main am: 1ab0564e65 am: 1a128321e3 am: 0292d222e7 am: 8621344b2c am: 4ec0c4a57e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2652824

Change-Id: I3b53de5f516a2d348d8172a3dd7ed884e4d0b1ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 21:33:57 +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
Treehugger Robot
3d50214490 Merge "Turn on Global ThinLTO by default" into main am: 71f5a63267 am: cad6091fc8 am: 5a73726e04 am: 609a030a85 am: e9372c7ba4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2200436

Change-Id: Ic0159fcb46e2038b8839e0204b348238f4d97af8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 21:33:44 +00:00
Treehugger Robot
a9f5243d87 Merge "Experiment with not using ninja weights" into main am: da7973112a am: f0fa7b4edf am: 39e844af6d am: 44eb6cebab am: e92d7044cd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2652025

Change-Id: I195023b7bbf892ac64030221c447e96442211ac2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 21:31:51 +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
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
Romain Jobredeaux
373a2eeef6 Merge "Support target and max sdk version in app bp2build." into main am: aa634fdbdb am: 5484ae074f am: 4e4274f597 am: 9dd8dc623f am: 47af21b8bd am: a76542f3ce
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2650657

Change-Id: Ibafdbc461d5c172a2a32766d08808b3d1f637fcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 17:49:10 +00:00
Treehugger Robot
71f5a63267 Merge "Turn on Global ThinLTO by default" into main 2023-07-11 17:42:12 +00:00
Treehugger Robot
da7973112a Merge "Experiment with not using ninja weights" into main 2023-07-11 17:42:06 +00:00
Romain Jobredeaux
a76542f3ce Merge "Support target and max sdk version in app bp2build." into main am: aa634fdbdb am: 5484ae074f am: 4e4274f597 am: 9dd8dc623f am: 47af21b8bd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2650657

Change-Id: I3560c2c3191ad79c1d65dfec949c3f540aa49414
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 17:05:16 +00:00
Jiakai Zhang
3444e561dc Change the profile path on host.
This is to decouple profile generation from image configs. A boot image
profile is either for a mainline module or for the platform, which is
orthogonal to boot images.

Bug: 290583827
Test: m nothing
Change-Id: I0918f2fa945a2af1839f1a08ecede331c64d0317
2023-07-11 17:59:24 +01:00
Jiakai Zhang
b1639db53f Extract duplicate code to common helper functions.
Also, fall back to using a default name for the dexpreopt directory if
we are not building for Android.

Bug: 290583827
Test: m nothing
Change-Id: I3fc6ff9142a2dcdf995796f75891b242fe2848d0
2023-07-11 17:59:05 +01:00
Romain Jobredeaux
47af21b8bd Merge "Support target and max sdk version in app bp2build." into main am: aa634fdbdb am: 5484ae074f am: 4e4274f597 am: 9dd8dc623f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2650657

Change-Id: I23aea14e4eb347bb86ff10be5abdf1ebed3b644e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 16:21:27 +00:00
Romain Jobredeaux
9dd8dc623f Merge "Support target and max sdk version in app bp2build." into main am: aa634fdbdb am: 5484ae074f am: 4e4274f597
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2650657

Change-Id: I258afa5d37dca61a17efc7c66058e0b184f9b90d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 15:35:25 +00:00
Jiakai Zhang
da47d3c6f3 Fix dumpOatRules.
This method generates a build rule that runs oatdump for debugging
purposes.

- Pass "--runtime-arg -Xgc:CMC" to oatdump if UFFD GC is enabled.
- Build the phony name from the image name to avoid conflicts when using
  this method for multiple boot images.

Bug: 290583827
Test: m dump-oat-boot
Change-Id: I7adc97cb85b571486b78f173fb80ff7da2c4bfe4
2023-07-11 16:27:01 +01:00
Romain Jobredeaux
4e4274f597 Merge "Support target and max sdk version in app bp2build." into main am: aa634fdbdb am: 5484ae074f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2650657

Change-Id: I63c3932ecc810654cf764171ded6a1506c06fd04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 14:55:30 +00:00
Jiakai Zhang
f7f782c4f1 Remove Modules() from BootclasspathFragmentApexContentInfo.
The Modules() method was for the ART boot image in the ART APEX. It's no
longer needed because we don't install the ART boot image in the ART
APEX anymore.

Bug: 290583827
Test: m nothing
Change-Id: I674a5fa1ed18908413a64129df5947c7d26e638e
2023-07-11 15:29:17 +01:00
Jiakai Zhang
b69e89559f Fix some tests for dexpreopt and remove unnecessary tests.
This CL is to prepare for the changes in http://r.android.com/2652081.
See the description of that CL for the reasons.

Some tests were set up in a fragile way and were easy to be broken when
the implementation changes. This CL is a pure test change that fixes
them.

This CL also removes TestNoUpdatableJarsInBootImage. That test checks
what should go to the ART boot image and what should go to the
platform one, which does not apply today because boot images are not
associated with mainline modules anymore: a boot image may take jars
from multiple mainline modules and the platform, and a mainline module
can contribute to multiple boot images. In practice, we have ART jars in
the platform boot image, and we are going to add core-icu4j and
consrypt to the ART boot image, which is now for testing only.

Bug: 290583827
Test: m nothing
Change-Id: I22c45cbf6f853b030b68edb51197854e9c53a02e
2023-07-11 15:29:12 +01:00
Romain Jobredeaux
5484ae074f Merge "Support target and max sdk version in app bp2build." into main am: aa634fdbdb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2650657

Change-Id: Ia09f51d07aad7c1b22d58b79376ab616f9cf8dd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 14:13:19 +00:00
Romain Jobredeaux
aa634fdbdb Merge "Support target and max sdk version in app bp2build." into main 2023-07-11 13:34:29 +00:00
Yi Kong
add6375a10 Turn on Global ThinLTO by default
Build C/C++ targets with ThinLTO with "--lto-O0" by default. This takes
advantage of better dead code elimination and CFG simplification due to
ThinLTO's global view of the program, but do not enable the costly LTO
optimizations. This also makes builds faster because we can avoid doing
codegen for the dead code.

Code size for panther-userdebug:
                   /system/bin  /system/lib  /system/lib64
Original           57648        86264        181700
Global ThinLTO     55764        84916        175728
                   -3.27%       -1.56%       -3.29%

Build time for aosp_arm64-userdebug:
                   clang time   linker time
Original           56993.87s    1712.36s
Global ThinLTO     52839.18s    3114.93s

saving 4.68% build time in total.

Bug: 169004486
Test: presubmit
Change-Id: Idb0f4675ca4750b8b12b24f4679579419d3448c8
2023-07-11 21:26:52 +09:00
Aditya Kumar
f33c56b8a5 Merge "gsimple-template-names" into main am: 9488eb82d4 am: 682eb3468e am: e52b326e93 am: df85ea75d4 am: 3c22bcefa8 am: 12eb83a23a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2607728

Change-Id: I9d8b54c5dc38e00e2af528cc43d11b8106f97ed2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 10:15:50 +00:00
Aditya Kumar
12eb83a23a Merge "gsimple-template-names" into main am: 9488eb82d4 am: 682eb3468e am: e52b326e93 am: df85ea75d4 am: 3c22bcefa8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2607728

Change-Id: I60468304aae36eac3a4cf132ce7646748dd6cbd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 09:35:32 +00:00