Commit Graph

70166 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
df85ea75d4 Merge "gsimple-template-names" into main am: 9488eb82d4 am: 682eb3468e am: e52b326e93
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2607728

Change-Id: I1e2c8565c1f74f82abf69949c46dc9cfc2d66818
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 08:13:51 +00:00
Aditya Kumar
e52b326e93 Merge "gsimple-template-names" into main am: 9488eb82d4 am: 682eb3468e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2607728

Change-Id: I866314b03d6fbe2093c694ce3416513679a4da98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 07:11:30 +00:00
Treehugger Robot
66baac045c Merge "Copy imported APKs to output filename" into main am: 5af242249d am: 84d32c5b1c am: b4a858d7a0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2652823

Change-Id: Ie831e50670911dcd3b774871c1cee5d7f3efc3dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 06:49:03 +00:00
Aditya Kumar
682eb3468e Merge "gsimple-template-names" into main am: 9488eb82d4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2607728

Change-Id: I4a504cd5fed09f7d7e3d3aa5f15f51adb9c8822b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 06:29:01 +00:00
Treehugger Robot
b4a858d7a0 Merge "Copy imported APKs to output filename" into main am: 5af242249d am: 84d32c5b1c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2652823

Change-Id: I4d1d9f10003b565b70f6023d28c747f45cef129d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 06:06:24 +00:00
Aditya Kumar
9488eb82d4 Merge "gsimple-template-names" into main 2023-07-11 05:54:11 +00:00
Treehugger Robot
84d32c5b1c Merge "Copy imported APKs to output filename" into main am: 5af242249d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2652823

Change-Id: I087856e45b24e9a0fadceecca1c0dcb13cb9ef81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 05:26:46 +00:00
Treehugger Robot
5af242249d Merge "Copy imported APKs to output filename" into main 2023-07-11 04:52:46 +00:00
Igor Foox
d42c460648 Merge "Update genrule denylist to make m droid build." into main am: 921a465919 am: 1113811927 am: 727f6ce321
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2651202

Change-Id: I48bdaf64268cf98f1b533b4bda07af0d34318772
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 00:50:20 +00:00
Igor Foox
727f6ce321 Merge "Update genrule denylist to make m droid build." into main am: 921a465919 am: 1113811927
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2651202

Change-Id: I08d84dab9ed7a76f7e0f100c6c17cbd283c058b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 00:10:45 +00:00
Igor Foox
1113811927 Merge "Update genrule denylist to make m droid build." into main am: 921a465919
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2651202

Change-Id: Ic15817a72cdebb304f115499171c74027e4c0573
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 23:28:55 +00:00
Igor Foox
921a465919 Merge "Update genrule denylist to make m droid build." into main 2023-07-10 22:51:44 +00:00
Wei Li
59df0ee442 Add integration test for m build SBOM of APEXs/APKs.
Bug: 266726655
Test: build/soong/tests/sbom_test.sh
Change-Id: Id8002042f607f8e158f561ca47e0a84a8b8927e2
2023-07-10 15:50:38 -07:00
Colin Cross
5780d57a71 Copy imported APKs to output filename
android_app_import and android_test_import modules with processed: true
and skip_preprocessed_apk_checks are used directly from the source tree.
If the source file name doesn t match the module name and the file is
used as test data it can result in the wrong filename being used.  Copy
the source file to an output file with the correct name first.

Bug: 290376750
Test: m CtsAppSecurityHostTestCases
Change-Id: I4a6dd1c5e48db7085ea41035def31f0844948a46
2023-07-10 22:18:01 +00:00
Igor Foox
04ff5f90ae Update genrule denylist to make m droid build.
Test: lunch aosp_cf_x86_phone && GENRULE_SANDBOXING=true m droid
Change-Id: I9092df9a407ffe9a7f1c12f18fb0ce1c5fa027a1
2023-07-10 14:58:51 -04:00
AdityaK
423e4ce9e3 gsimple-template-names
Based on: https://chromium-review.googlesource.com/c/chromium/src/+/3988987

```
Savings are almost 330M on 11G

du -s out.diff/target/product/vsoc_arm64/symbols
10751692        out.diff/target/product/vsoc_arm64/symbols
du -s out/target/product/vsoc_arm64/symbols
11086508        out/target/product/vsoc_arm64/symbols
```

Change-Id: I49a5c4cadc77cb0d97e680e95c4efa7156a42f13
2023-07-10 17:36:22 +00:00
Elliott Hughes
7daa03e9a3 Merge "Remove -fstrict-aliasing from arm32." into main am: ff96fe1589 am: 4f31fc623d am: 1c20ecc192
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2646182

Change-Id: I5a4e09bc37a6ab46f4cbd102005d962bbd5f3223
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 16:41:48 +00:00
Elliott Hughes
1c20ecc192 Merge "Remove -fstrict-aliasing from arm32." into main am: ff96fe1589 am: 4f31fc623d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2646182

Change-Id: I5c389ef26acfb26e37089f2d6ecf10ae627dfb6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 16:01:40 +00:00
Romain Jobredeaux
496660d38a Support target and max sdk version in app bp2build.
Test: Unit tests + CI
Bug: 285304294
Bug: 280465047
Change-Id: I9bb1b6f9729ad783a43837d77dcf2d02b50ca77e
2023-07-10 11:50:00 -04:00
Elliott Hughes
4f31fc623d Merge "Remove -fstrict-aliasing from arm32." into main am: ff96fe1589
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2646182

Change-Id: I6be82a82dbb7161d78ceb702eddececab01e245a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 15:20:10 +00:00