Commit graph

76290 commits

Author SHA1 Message Date
Treehugger Robot
0102b36aaf Merge "Sandbox aidl-golden-test-build-hook-gen" into main am: 3ecf33c4ee
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853547

Change-Id: I66d347a0a29b89022fbe6e6ee8407d5f9f7c0f72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-30 04:29:50 +00:00
Treehugger Robot
3ecf33c4ee Merge "Sandbox aidl-golden-test-build-hook-gen" into main 2023-11-30 03:41:11 +00:00
Cole Faust
141314e11a Sandbox aidl-golden-test-build-hook-gen
Bug: 307824623
Test: m aidl-golden-test-build-hook-gen
Change-Id: I71ebe9d16702be15a8dc98b10dedf685114daed8
2023-11-29 17:47:12 -08:00
Colin Cross
c65780626c Merge "Don't write transitive dependencies to Android-${TARGET_PRODUCT}.mk" into main am: 556ba81849
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2842060

Change-Id: I854bc7c67d7d4525fef42b031ad0b9a9c9080643
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-30 01:26:48 +00:00
Colin Cross
556ba81849 Merge "Don't write transitive dependencies to Android-${TARGET_PRODUCT}.mk" into main 2023-11-30 00:41:43 +00:00
Treehugger Robot
26539fd5e8 Merge "Support experimental building with OpenJDK 21" into main am: 8f7ee30d21
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853425

Change-Id: I9bcd13d2b770982a638b41cd82284c96e8293186
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 21:19:28 +00:00
Treehugger Robot
8f7ee30d21 Merge "Support experimental building with OpenJDK 21" into main 2023-11-29 20:25:25 +00:00
Ramya Subramanian
ff5cf349f5 Merge "Revert "Enable dex container (DEX v41) for the whole system"" into main am: 29e05d1007
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853365

Change-Id: Iecfcf43f2809a8249c59adeb8092902152f61b51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 19:54:32 +00:00
Treehugger Robot
0ea94eb46c Merge "Sandbox chre_atoms_log.h and deqp_spvtools_update_build_version" into main am: 7d7d94ffd2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2849969

Change-Id: I155d942be1a665886defb655325e86b659aff823
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 19:52:01 +00:00
Ramya Subramanian
29e05d1007 Merge "Revert "Enable dex container (DEX v41) for the whole system"" into main 2023-11-29 19:38:50 +00:00
Sorin Basca
0760c89882 Support experimental building with OpenJDK 21
Use EXPERIMENTAL_USE_OPENJDK21_TOOLCHAIN=true to build with OpenJDK 21
while still targeting java language version 17.

Bug: 313924276
Test: m EXPERIMENTAL_USE_OPENJDK21_TOOLCHAIN=true
Change-Id: Idc892bb7519e597f1e280ca0765c1a281bb29955
2023-11-29 19:13:55 +00:00
Treehugger Robot
7d7d94ffd2 Merge "Sandbox chre_atoms_log.h and deqp_spvtools_update_build_version" into main 2023-11-29 18:36:10 +00:00
Ramya Subramanian
432fbfa848 Revert "Enable dex container (DEX v41) for the whole system"
This reverts commit b82a2a278b.

Reason for revert: DroidMonitor: Potential culprit for multiple Module failures on ATH. verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.”.

Change-Id: I3899a45cce259c4ee38572e76f4735eccb3ca66a
2023-11-29 18:34:31 +00:00
Colin Cross
312634eb0f Don't write transitive dependencies to Android-${TARGET_PRODUCT}.mk
Java libraries were writing lists of files that changed whenever
transitive dependencies changed to Android-${TARGET_PRODUCT}.mk, causing
Kati analysis to rerun whenever a dependency was changed in Soong.
In both cases, Make would immediately use the list to write a single
output file.  Write the files in Soong and pass the path to the file
to Make instead, which will both reduce the size of
Android-${TARGET_PRODUCT}.mk and skip Kati analysis more often.

Bug: 309006256
Test: m checkbuild
Change-Id: I5dff16c6fb7cca8c6da927b37c612c7b1d0954e6
2023-11-29 10:31:13 -08:00
Anas Sulaiman
7eb74575b5 Merge "allow specifying remote caching opt for rewrapper" into main am: 80117e6c4f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2838517

Change-Id: I3d3a9a4a05d364ac88277e6a0e2e9904c21e467d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 18:07:57 +00:00
Anas Sulaiman
80117e6c4f Merge "allow specifying remote caching opt for rewrapper" into main 2023-11-29 16:36:21 +00:00
Treehugger Robot
4a8f6e8607 Merge "Sandbox seller-frontend-service-stub-lite" into main am: 0fd71d0232
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2847996

Change-Id: I592741712dfc44524293d94ef34d7dae85994c59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 14:55:33 +00:00
Treehugger Robot
0fd71d0232 Merge "Sandbox seller-frontend-service-stub-lite" into main 2023-11-29 14:20:24 +00:00
Jiakai Zhang
36c8b1d229 Merge "Remove PreoptExtractedApk." into main am: ba45ba5763
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2848255

Change-Id: I627974d669b4e978ff555553fa94fd5bfc63f7c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 10:50:42 +00:00
Rico Wind
77379a479f Merge "Reapply "Use R8 for resource shrinking"" into main am: 2f6b403ccd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2846953

Change-Id: I787623b4073f8c550f6d94ff0855fda873167d0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 10:50:13 +00:00
Jiakai Zhang
ba45ba5763 Merge "Remove PreoptExtractedApk." into main 2023-11-29 10:17:29 +00:00
Rico Wind
2f6b403ccd Merge "Reapply "Use R8 for resource shrinking"" into main 2023-11-29 10:16:36 +00:00
Yi Kong
39e267f956 Merge "Remove PGO build support" into main am: 33914a613f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2845655

Change-Id: I5ee81e0edf10806712cc45b8d7b02a5a3ff215e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 08:16:03 +00:00
Yi Kong
33914a613f Merge "Remove PGO build support" into main 2023-11-29 07:35:14 +00:00
Jeongik Cha
4bd956d69d Merge "Show estimated build end time during build" into main am: 98c0c8323f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2840455

Change-Id: Iaeca62d0f75bce85c211b7456dad22afa2c7dbb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 06:01:35 +00:00
Rico Wind
98e7fa8db1 Reapply "Use R8 for resource shrinking"
This reverts commit a9fd59a7f2.

We are moving the resource shinking pipeline into r8 (gennerally, not just for platform)

This disables the usage of the resource shrinker cli from cmd-line tools

There are no changes in this cl compared to the original land, the fix
was done in R8 (to use the same compression for res folder entries as
in the original)

Bug: 308710394
Bug: 309078004
Test: Existing, validated that resource table on SystemUI was byte<>byte equal, validated uncompression

Merged-In: Ib8a6fb128084e994325b975c46a036cb41494654

Change-Id: Id45b170dd50f75bc87e21ad03b2d0679efb7adc2
2023-11-29 05:07:50 +00:00
Jeongik Cha
98c0c8323f Merge "Show estimated build end time during build" into main 2023-11-29 04:51:23 +00:00
Treehugger Robot
68c87f7b73 Merge "rustc-1.73.0 Build 11110309" into main am: c0e9dbd109
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2834891

Change-Id: Icbee38ccb30cd8fc3cb27267915f42dc36d77373
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 04:20:23 +00:00
Treehugger Robot
c0e9dbd109 Merge "rustc-1.73.0 Build 11110309" into main 2023-11-29 03:21:57 +00:00
Jooyung Han
f9c573653c Merge "Add non_apex.exclude_shared_libs to cc" into main am: 2648a99386
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2849278

Change-Id: I88115bd157f5c8eb5135f2c53a394998d9e92799
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 02:14:34 +00:00
Jooyung Han
2648a99386 Merge "Add non_apex.exclude_shared_libs to cc" into main 2023-11-29 01:44:33 +00:00
Treehugger Robot
66dd52b74d Merge "Enable dex container (DEX v41) for the whole system" into main am: 7d813e0dba
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2238838

Change-Id: I166e8dfcb9e7ad9bfd4c4edfae56beb9215d8680
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 01:07:05 +00:00
Jeongik Cha
3622b3464b Show estimated build end time during build
Ninja delivers estimated total build time and critical path time from
previous ninja log.

Bug: 292304818
Test: check if ETA shows
Change-Id: I014caaa3e8222a53c8822616b2ae31b88a3b0310
2023-11-29 09:57:35 +09:00
Anas Sulaiman
9d7a36d17f allow specifying remote caching opt for rewrapper
This is needed to enable local execution via reproxy for metalava
actions for developer builds without causing permissions errors
and without disabling it for other actions.

Bug: b/308154125
Tested: ran a local build and verified all metalava actions were
executed locally without attempting to write to the remote cache.

Change-Id: Ia6f616e1ff5d0c71597ebf688765925ac81d19c3
2023-11-29 00:42:08 +00:00
Treehugger Robot
7d813e0dba Merge "Enable dex container (DEX v41) for the whole system" into main 2023-11-29 00:32:48 +00:00
Colin Cross
6d3474d64c Merge "Don't write license data to Android-${TARGET_PRODUCT}.mk" into main am: 74656ccf35
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2842061

Change-Id: I053985b4b5c3d53d06e61fde9d88ad57daaadb64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28 23:07:28 +00:00
Treehugger Robot
8391d4ff5c Merge "Sandbox ScriptGroupTest-rscript" into main am: 5ca7b8ed22
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2847997

Change-Id: I5ff765ed7026904d8bc7dd1545775bf0900e4158
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28 23:07:02 +00:00
Colin Cross
74656ccf35 Merge "Don't write license data to Android-${TARGET_PRODUCT}.mk" into main 2023-11-28 22:51:32 +00:00
Treehugger Robot
5ca7b8ed22 Merge "Sandbox ScriptGroupTest-rscript" into main 2023-11-28 22:19:57 +00:00
Cole Faust
12dcc8649e Sandbox chre_atoms_log.h and deqp_spvtools_update_build_version
go/roboleaf-busy-beavers-sandboxing

deqp_spvtools_update_build_version gets this diff:
  < "v2022.4-dev", "SPIRV-Tools v2022.4-dev android-u-beta-1-gpl-177-g1ef94532"
  ---
  > "v2022.4-dev", "SPIRV-Tools v2022.4-dev unknown hash, 2023-11-28T19:30:48"

But it already has a comment on it to revisit its usage of git,
which doesn't work on CI.

Bug: 307824623
Test: ./build/soong/tests/genrule_sandbox_test.py chre_atoms_log.h deqp_spvtools_update_build_version
Change-Id: I759970a5687c4f75116a40f5c127ae762da4ee95
2023-11-28 12:39:09 -08:00
Cole Faust
0fcbe14ab4 Merge "Sandbox cronet genrules" into main am: 38969102dd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2842063

Change-Id: I461274b5169e7af47f8d1bc9d548f5b076bffa46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28 19:02:26 +00:00
Cole Faust
2d7546c0cb Merge "Sandbox apexd test genrules" into main am: 122767d27c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2848754

Change-Id: I79938a0b6dd990bbf650df052b74c457348fa2b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28 18:48:54 +00:00
Cole Faust
38969102dd Merge "Sandbox cronet genrules" into main 2023-11-28 18:30:40 +00:00
Cole Faust
122767d27c Merge "Sandbox apexd test genrules" into main 2023-11-28 17:58:28 +00:00
Jooyung Han
9ffbe83028 Add non_apex.exclude_shared_libs to cc
This can be used to add apex-specific shared_libs to a CC module. It
would be nice if we could have apex.shared_libs. But it would make code
much harder to follow because we need to record the shared_libs list as
"exclude list" for non-apex anyway.

Bug: 312510312
Test: m libhardware libhardware.vendor libhardware.vendor.com.google.cf.ir
  # check DTNEEDED for libapexsupport
  # only apex-variant should have the dependency
Change-Id: I56a3dc280127d8ba44337707444ea226a49ccf0f
2023-11-28 22:42:23 +09:00
Jiakai Zhang
db93553b02 Remove PreoptExtractedApk.
This was added by r.android.com/513843 to force dexpreopt some GMS core
modules even if dexpreopt is disabled, to avoid some memory usage
regression. We no longer need it because dexpreopt is never disabled on
production builds.

Bug: 313505540
Test: m
Change-Id: I605b7569c17ee715cd4df167768e25aaf51bcd37
2023-11-28 13:40:58 +00:00
Søren Gjesse
b82a2a278b Enable dex container (DEX v41) for the whole system
Bug: b/249922554
Test: device boots
Change-Id: Idc63034cc7d5f4bc4533d1f580eeffe1494b56a6
2023-11-28 13:24:21 +00:00
Treehugger Robot
f6a132e0a5 Merge "Add support for parsing 'LOCAL_TARGET_SDK_VERSION' in androidmk" into main am: 130079c893
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2849235

Change-Id: Iefe8dfbf1f372021abe10b26e9b5bdd448e8b046
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28 09:53:13 +00:00
Treehugger Robot
130079c893 Merge "Add support for parsing 'LOCAL_TARGET_SDK_VERSION' in androidmk" into main 2023-11-28 09:11:46 +00:00
Herbert Xue
caadada423 Add support for parsing 'LOCAL_TARGET_SDK_VERSION' in androidmk
Update androidmk to enable parsing of 'LOCAL_TARGET_SDK_VERSION' from
an Android.mk and translating it to target_sdk_version in an Android.bp.

Bug: 313336240
Test: m androidmk
Test: androidmk vendor/xts/gts-tests/tests/assist/Android.mk
Change-Id: I465aba3ea7d22a9978fc370a6718a2cfc43dce36
2023-11-28 17:01:00 +08:00