StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,289 Commits 1 Branch 0 Tags
b22fb3598107e8ec8851f901b03404f24e812d3a
Commit Graph

80289 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colin Cross
76175f9752 Merge "Don't write license data to Android-${TARGET_PRODUCT}.mk" into main am: 74656ccf35 am: 6d3474d64c am: 1bcfdaddf1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2842061

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

Change-Id: Ic0b3f1ef668c17c48be656311d75897f887c1e21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-29 00:00:54 +00:00
Colin Cross
ad06c1efd4 Merge "Don't write license data to Android-${TARGET_PRODUCT}.mk" into main am: 74656ccf35 am: 2ce147b050 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2842061

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

Change-Id: Ia8bfba469c456f9cfa23807af5df792d4975fd69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-28 23:29:46 +00:00
Colin Cross
1bcfdaddf1 Merge "Don't write license data to Android-${TARGET_PRODUCT}.mk" into main am: 74656ccf35 am: 6d3474d64c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2842061

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

Change-Id: I40bb2b4a44fc4e555aa9d7465a499f705e04d59e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-28 23:27:55 +00:00
Colin Cross
2ce147b050 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: I0752b42f5d2ee27f820ec7f0252c0a218c222f91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-28 23:09:11 +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
Treehugger Robot
285602fb43 Merge "Sandbox ScriptGroupTest-rscript" into main am: 5ca7b8ed22 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2847997

Change-Id: I6073936ef0cf93a5aab1c7a4366b41ead5074957
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-28 22:56:46 +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
Colin Cross
e7151f971e Move startRBE error handling to the main goroutine 
When called from the startRBE goroutine, the panic ctx.Fatalf triggered
by is unhandled and causes the process to exit without cleaning up the
terminal.  Move most of the quick checks to a checkRBERequirements
function called on the main goroutine so they can be reported
immediately before running Soong and Kati, and recover any panics
from startRBE and report them after waiting on rbeCh.

Bug: 293501187
Test: gcertdestroy && m nothing
Change-Id: I62c84c93ab0a7f0e4f2ab2cc64b22e2070dd6e4c
 2023-11-28 22:35:37 +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
Yu Liu
eae7b36699 Add container property to aconfig_declarations. 
Bug: 311155208
Test: Unit test
Change-Id: I7b187138856d0144203961e82b6dad5e2f8eed9d
 2023-11-28 12:37:02 -08:00
Cole Faust
08894f4cfe Merge "Sandbox cronet genrules" into main am: 38969102dd am: 92af3b4130 am: 32fdebd6db 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2842063

Change-Id: If5ae779f36acdf6d862fe4e94eadf02879f99837
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-28 20:28:30 +00:00
Cole Faust
344cea69b4 Merge "Sandbox apexd test genrules" into main am: 122767d27c am: 717c1ad0e8 am: 2379e9afd3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2848754

Change-Id: I255d1476348ba690a94dc34890865079f2ccab00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-28 20:27:05 +00:00
Cole Faust
bdc4e316c3 Merge "Sandbox cronet genrules" into main am: 38969102dd am: 0fcbe14ab4 am: 67202b3aa1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2842063

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

Change-Id: Ia6d9ff7f872ddf05db337dde58d0bcf79a6122bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-28 20:25:30 +00:00
Cole Faust
32fdebd6db Merge "Sandbox cronet genrules" into main am: 38969102dd am: 92af3b4130 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2842063

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

Change-Id: I30860fb6c8f0f36334fbd6364c56f0a843b6546f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-28 19:39:05 +00:00
Cole Faust
28ac433d3e Sandbox vm-tests-tf-lib 
go/roboleaf-busy-beavers-sandboxing

This genrule is non-deterministic, (the jar files have timestamps)
so genrule_sandbox_test.py fails, but should otherwise work with
sandboxing.

Bug: 307824623
Test: m vm-tests-tf-lib
Change-Id: Ia8c60e7a0f134e839939622fd2747ff73ea3ce3c
 2023-11-28 11:23:31 -08:00
Cole Faust
67202b3aa1 Merge "Sandbox cronet genrules" into main am: 38969102dd am: 0fcbe14ab4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2842063

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

Change-Id: Iad7f8f7150f5ce0d2f0741a2e0e2b2614d204940
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-28 19:22:09 +00: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
92af3b4130 Merge "Sandbox cronet genrules" into main am: 38969102dd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2842063

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

Change-Id: I47c1e95461aad7ab7a865a062a037b3158b964e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-28 19:00:31 +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
Paul Duffin
640380699f Move special next handling of hidden APIs to java_sdk_library 
Previously, the logic to add the Metalava command line option
`--hide-annotation android.annotation.FlaggedApi` when
`SOONG_SDK_SNAPSHOT_HIDE_FLAGGED_APIS=true` was done in
`droidstubs.go`. It worked but it turns out that we need to pass more
options to Metalava in that situation because while we need to hide
most flagged APIs we need to release some flagged APIs whose features
are ready. They cannot have the `@FlaggedApi` annotation removed
because that would cause the APIs to be released in the next QPR which
is not what we want.

So, in addition to the above option we will need to pass additional
options to Metalava to tell it to keep some flagged APIs. Rather than
hard code that in the build, requiring build changes for every new
SDK extension release this change uses the argument expansion mechanism
in Metalava (treating `@<file>` as if the contents of `<file>` were
passed as command line options) to delegate that to
":sdkext-released-flagged-apis".

The easiest way to do that was to move the logic to `sdk_library.go`
as `droidstub` would do the work of tracking the file dependencies
correctly. It also reduces the affect modules to `java_sdk_library`
modules rather than all `droidstubs` modules.

Bug: 313398274
Test: UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true vendor/google/build/mainline_modules_sdks.sh --build-release=next
Change-Id: Ib1cf22f8ef74abc135215537e9311936372eaac7
Merged-In: I4967376c0236bad729398af80fa59b48dbab5f21
 2023-11-28 16:26:06 +00:00
Rico Wind
20c2010030 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

Ignore-AOSP-First: Merge does not apply cleanly

Change-Id: Ib8a6fb128084e994325b975c46a036cb41494654
 2023-11-28 13:47:02 +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
3d9f5b8bb9 Merge "Add support for parsing 'LOCAL_TARGET_SDK_VERSION' in androidmk" into main am: 130079c893 am: 86701df2f7 am: 5c565c1b5b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2849235

Change-Id: I28d3e089e252732c3a33bb010a611590beba79e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-28 11:12:54 +00:00
Treehugger Robot
2dcd02e6df Merge "Add support for parsing 'LOCAL_TARGET_SDK_VERSION' in androidmk" into main am: 130079c893 am: f6a132e0a5 am: 8c939ffb65 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2849235

Change-Id: I21d0b5e67740f52c149d90e614b4647bc3692034
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-28 11:12:42 +00:00
Treehugger Robot
5c565c1b5b Merge "Add support for parsing 'LOCAL_TARGET_SDK_VERSION' in androidmk" into main am: 130079c893 am: 86701df2f7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2849235

Change-Id: I20e65cb604e71b6507286038ff28a6544fab9f74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-28 10:42:27 +00:00
Treehugger Robot
8c939ffb65 Merge "Add support for parsing 'LOCAL_TARGET_SDK_VERSION' in androidmk" into main am: 130079c893 am: f6a132e0a5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2849235

Change-Id: I16defe3e0a6a05f70843f6a36a3ae365467e6899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-28 10:23:43 +00:00
Treehugger Robot
86701df2f7 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: I7304313fe0f16ded6825dec72f42ac86b0e607e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-28 10:04:39 +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
Treehugger Robot
61f0913cca Merge "Sandbox checkIn-service-stub-lite" into main am: a4291d572a am: 95d97ff02f am: fe4437e91a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2848757

Change-Id: I593acc5784fe1e832be563850f82c7e4c1a7a46e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-28 03:20:41 +00:00
Treehugger Robot
efbce908f7 Merge "Add defaults modules for avb modules" into main am: 0edba2a37e am: 2ca9e647bd am: c97d8cb1ab 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2842914

Change-Id: I249df4a799778871ab0af4cf2a26613660aa5959
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-28 03:20:21 +00:00
Treehugger Robot
9078f007f5 Merge "Sandbox checkIn-service-stub-lite" into main am: a4291d572a am: caf25476a0 am: 7e920cdef3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2848757

Change-Id: I4a973a466154ab592003fc232e6db8f5336306f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-28 03:20:02 +00:00
Treehugger Robot
08909dc23e Merge "Add defaults modules for avb modules" into main am: 0edba2a37e am: 034251de5e am: 03cebee225 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2842914

Change-Id: Id5c39acf50903cf56d921910d8c9d16db6afb4b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-28 03:19:23 +00:00
Treehugger Robot
fe4437e91a Merge "Sandbox checkIn-service-stub-lite" into main am: a4291d572a am: 95d97ff02f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2848757

Change-Id: I574121de98fd6408443035920f8a05be98f630be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-28 03:05:07 +00:00
Treehugger Robot
c97d8cb1ab Merge "Add defaults modules for avb modules" into main am: 0edba2a37e am: 2ca9e647bd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2842914

Change-Id: Ieaaf354d7bde600df8711eab9b295dd588a587a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-28 03:04:51 +00:00
Treehugger Robot
7e920cdef3 Merge "Sandbox checkIn-service-stub-lite" into main am: a4291d572a am: caf25476a0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2848757

Change-Id: Ic2563a31e85db72b8f0185a2e1b3192fac922337
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-28 02:47:25 +00:00