StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,251 Commits 1 Branch 0 Tags
36c3d96b654322e66b74b9e059660e566a0b50a3
Commit Graph

7947 Commits

Author SHA1 Message Date
Jihoon Kang
dd3491dcbe Merge "Disable from-text stub build for coverage build" into main am: 04803d4767 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2789434

Change-Id: I14b132f22c9e1486dda8baaf9b400018bb2f7d77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-19 20:00:51 +00:00
Jihoon Kang
04803d4767 Merge "Disable from-text stub build for coverage build" into main 2023-10-19 19:22:33 +00:00
Xin Li
709e5f5389 Merge "Merge 10952656" into aosp-main-future 2023-10-19 17:58:29 +00:00
Cole Faust
b251515ac8 Merge "gofmt soong" into main am: 14c1ed8d7d am: 2cc9eea91d am: f2d3e5b72b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2797038

Change-Id: Ibfff520b15692a58c911d6290f5674d74571d716
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-19 05:27:04 +00:00
Cole Faust
f2d3e5b72b Merge "gofmt soong" into main am: 14c1ed8d7d am: 2cc9eea91d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2797038

Change-Id: I34e7144e3ee1a4988256157d77b1ffa850201cc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-19 04:51:24 +00:00
Cole Faust
d342eaa5c7 Merge "gofmt soong" into main am: 14c1ed8d7d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2797038

Change-Id: I4e3a84df5dbfe4ab58b4064f84a516e69b0c6cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-19 04:21:15 +00:00
Cole Faust
14c1ed8d7d Merge "gofmt soong" into main 2023-10-19 03:48:45 +00:00
Treehugger Robot
b2f0c0de24 Merge changes from topic "revert-2786699-import-sdk-version-none-WYNCDQGHTE" into main am: 8e592ad109 am: 479e1e4f92 am: 848a66dda6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2796694

Change-Id: I109e980f2824290d7a34d1c87b7e521b60bd7de6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-19 01:17:26 +00:00
Treehugger Robot
848a66dda6 Merge changes from topic "revert-2786699-import-sdk-version-none-WYNCDQGHTE" into main am: 8e592ad109 am: 479e1e4f92 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2796694

Change-Id: I948dd4d42345d8bf701b0a03e8092a2062e10324
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-19 00:46:00 +00:00
Cole Faust
06ea531ab3 gofmt soong 
Test: Presubmits
Change-Id: Ia76c35ba51685eca29df51738000eacd3f43ce20
 2023-10-18 17:42:59 -07:00
Treehugger Robot
b1c9fc707e Merge changes from topic "revert-2786699-import-sdk-version-none-WYNCDQGHTE" into main am: 8e592ad109 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2796694

Change-Id: I5a10ce519e0a953a93d78cb11d3ef6a122c2992e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-19 00:15:55 +00:00
Treehugger Robot
8e592ad109 Merge changes from topic "revert-2786699-import-sdk-version-none-WYNCDQGHTE" into main 
* changes:
  Revert "Don't use java_library for java_import neverlink"
  Revert "Do not convert sdk_version: "none""
 2023-10-18 23:38:27 +00:00
Treehugger Robot
d1685161b5 Merge "Shard Javac" into main am: eecf47b14c am: 179503971a am: a1ea62d1cb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2768337

Change-Id: I0bb24e5a1dab8fdffc2a3f692a612df7fc2a76e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-18 23:23:43 +00:00
Treehugger Robot
a1ea62d1cb Merge "Shard Javac" into main am: eecf47b14c am: 179503971a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2768337

Change-Id: I44574c63d3584bba15cb6a653e8eb1b22b4b5a38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-18 23:06:05 +00:00
Treehugger Robot
5d34fea011 Merge "Shard Javac" into main am: eecf47b14c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2768337

Change-Id: I1dc969b7a0639fda21501f2cc6c6728ed2767e16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-18 22:33:50 +00:00
Treehugger Robot
eecf47b14c Merge "Shard Javac" into main 2023-10-18 22:20:39 +00:00
Liz Kammer
e11182283f Revert "Don't use java_library for java_import neverlink" 
Revert submission 2786699-import-sdk-version-none

Reason for revert: b/306220520

Reverted changes: /q/submissionid:2786699-import-sdk-version-none

Change-Id: I4fbe5fa54dc11fac898a7f15704833f01b9fa269
 2023-10-18 20:38:37 +00:00
Liz Kammer
05f487a4cd Revert "Do not convert sdk_version: "none"" 
Revert submission 2786699-import-sdk-version-none

Reason for revert: b/306220520

Reverted changes: /q/submissionid:2786699-import-sdk-version-none

Change-Id: I309e269db70d9fedaf010ef44791516392fcb4ea
 2023-10-18 20:38:37 +00:00
Anas Sulaiman
9c4936405e support toggling compare mode for rbe actions 
This allows me to set metalava actions to run remotely (already toggleable) with local comparison (this CL).

Change-Id: I66b006d5ee11b3192ef81a2e5cefc07e9f3d10a2
 2023-10-18 19:37:24 +00:00
Colin Cross
5380e6ef71 Merge "Export resource processor R.jar files to ASfP" into main am: c292fa1797 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2794454

Change-Id: I40c966fae64ec8a026880ef30cd5fa1b022ccac9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-18 19:21:55 +00:00
Colin Cross
a2deb31959 Merge "Export resource processor R.jar files to ASfP" into main am: c292fa1797 am: 8b57d1d786 am: 81a4d1ee2f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2794454

Change-Id: Iabf13796e8a91e38332ec1c9140c10555b052d87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-18 19:19:03 +00:00
Colin Cross
81a4d1ee2f Merge "Export resource processor R.jar files to ASfP" into main am: c292fa1797 am: 8b57d1d786 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2794454

Change-Id: Ic2b15d1a60c9cbcdc2f2ea8ca0cf8ed8240b2738
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-18 19:17:57 +00:00
Treehugger Robot
12401a475d Merge changes from topic "import-sdk-version-none" into main am: a815d9bf79 am: bd9bd6b282 am: 81fcb1be3b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2786699

Change-Id: I73faf2854d41d77beb8b7cd879f7c02bc43e355c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-18 19:17:43 +00:00
Colin Cross
c292fa1797 Merge "Export resource processor R.jar files to ASfP" into main 2023-10-18 18:24:48 +00:00
Treehugger Robot
81fcb1be3b Merge changes from topic "import-sdk-version-none" into main am: a815d9bf79 am: bd9bd6b282 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2786699

Change-Id: I08b8d03de4e093d8e23183f195d7e30e240e9c45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-18 18:23:01 +00:00
Treehugger Robot
93fb6ea605 Merge changes from topic "import-sdk-version-none" into main am: a815d9bf79 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2786699

Change-Id: I7bb683264451e783bef427965adea3bec1c733d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-18 17:49:31 +00:00
usta
15ab550d04 Shard Javac 
Test: m nothing
Test: allowlist frameworks/opt/calendar to bp2build convert
Test: add `javac_shard_size: 2` to calendar-common
Test: b //frameworks/opt/calendar:calendar-common
Bug: 297356812
Change-Id: Ie22bcf04946f3945952a74a46772b777b1522b70
 2023-10-18 13:25:55 -04:00
Treehugger Robot
a815d9bf79 Merge changes from topic "import-sdk-version-none" into main 
* changes:
  Do not convert sdk_version: "none"
  Don't use java_library for java_import neverlink
 2023-10-18 17:17:59 +00:00
Liz Kammer
d3549fcb10 Merge changes Iceb0b68f,I04865414 into main am: a855f73f4a am: 9c845e2cf0 am: 5eb30c456f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2789776

Change-Id: I6c0d0c38379d48cd166ef34857098bee7bd47d8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-18 16:00:52 +00:00
Liz Kammer
5eb30c456f Merge changes Iceb0b68f,I04865414 into main am: a855f73f4a am: 9c845e2cf0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2789776

Change-Id: I896ba72be52974c7a69ea65a12dcc55a821eb48e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-18 15:28:17 +00:00
Liz Kammer
4b803d5adb Merge changes Iceb0b68f,I04865414 into main am: a855f73f4a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2789776

Change-Id: I42aeec6bae67a10bdd8aa85ad363ef7419850387
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-18 14:57:14 +00:00
Liz Kammer
a855f73f4a Merge changes Iceb0b68f,I04865414 into main 
* changes:
  Improve error message readability
  Share constants for droidstubs btw Soong & Bazel
 2023-10-18 14:19:30 +00:00
Colin Cross
95b53b83eb Export resource processor R.jar files to ASfP 
Export the R.jar files generated by ResourceProcessorBusyBox to
module_bp_java_deps.json for use by Android Studio for Platform.

Bug: 305997998
Test: examine module_bp_java_deps.json
Change-Id: I48e3e28b45219646765de7848ec9dbe77d14c662
 2023-10-17 13:21:02 -07:00
Jihoon Kang
1975d3e326 Disable from-text stub build for coverage build 
Coverage builds depend on `native` properties for API elements, which
are not included in the API signature files and consequently in
from-text stubs. As no robust solution for handling this has been
planned out at the moment, from-text stub build is disabled for
coverage builds.

Per go/android-code-coverage-quickstart , Java code coverage is
enabled by the three environment variables: `EMMA_INSTRUMENT`,
`EMMA_INSTRUMENT_STAIC` and `EMMA_INSTRUMENT_FRAMEWORK`. This change
disables from-text stub build if any of the three variables are set
to true.

Test: go test ./java && m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true nothing --build-from-text-stub and inspect ninja query to verify that the stub java library module depends on the from-source stub module
Bug: 304271961
Change-Id: Ie485c784145de6c253611e698354c4f9e4a30685
 2023-10-17 20:00:12 +00:00
Treehugger Robot
311b71cc21 Merge "Fix typo in droidstubs" into main am: 2b808d0f22 am: 1d83966db8 am: bfb6df0b0e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2789772

Change-Id: I3283ed024685ba6949d93b1ecc12b7a749b45172
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-17 17:39:31 +00:00
Xin Li
b38b15ca24 Merge 10952656 
Merged-In: I9bc9ea2b2760af5b57dd69463658bff3b8e74d9d
Change-Id: Ib253282aaf5fc14e6ea114bcd625c4cc7ebfbc9d
 2023-10-17 10:05:50 -07:00
Treehugger Robot
bfb6df0b0e Merge "Fix typo in droidstubs" into main am: 2b808d0f22 am: 1d83966db8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2789772

Change-Id: I73f1c58718cc0188bfc0226b47cb233914a1ca72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-17 16:47:50 +00:00
Treehugger Robot
ce02e31815 Merge "Fix typo in droidstubs" into main am: 2b808d0f22 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2789772

Change-Id: Ia7bec25fd6f8950e63207e4b2cb484bfae979699
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-17 16:19:01 +00:00
Treehugger Robot
2b808d0f22 Merge "Fix typo in droidstubs" into main 2023-10-17 15:39:40 +00:00
Liz Kammer
5dfe4be626 Do not convert sdk_version: "none" 
These also require system_modules to be set. Wait until we convert
system_modules to convert sdk_version: "none"

Test: CI
Change-Id: I5bbdcb6819709a7c5a7932cb860a0de945f3528e
 2023-10-17 09:10:13 -04:00
Liz Kammer
4e00b0929b Don't use java_library for java_import neverlink 
Restricting use of sdk_version = "none" to only the rule types that will
correctly handled sdk_version = "none" by also handling system_module
attr

Test: CI && go tests
Change-Id: Ifa1c60ba8f5e3fcb28986cc84cdfaedcbd2d2957
 2023-10-17 09:10:13 -04:00
Liz Kammer
e09e20ec47 Share constants for droidstubs btw Soong & Bazel 
Test: m bp2build && verify constants
Change-Id: I04865414fb627672821b10d8bcc736379dc3da86
 2023-10-17 09:10:08 -04:00
Treehugger Robot
1881a83f05 Merge "Add assets property for Android apps." into main am: c82e844121 am: ab202d1aa2 am: e5d4f786c8 am: 2e2a37666f am: 45c943b958 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2786252

Change-Id: Ie0b10c2f2b24e8d626f0a7d8f6b3fd94cda7fdd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-16 22:44:01 +00:00
Treehugger Robot
e5d4f786c8 Merge "Add assets property for Android apps." into main am: c82e844121 am: ab202d1aa2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2786252

Change-Id: I5289eaac6ff9d7e8667f3a345ed0ba70a2e25568
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-16 21:16:00 +00:00
Treehugger Robot
c82e844121 Merge "Add assets property for Android apps." into main 2023-10-16 21:01:44 +00:00
Liz Kammer
170dd7239a Fix typo in droidstubs 
Test: n/a
Change-Id: Idd58be843d01db008f1815f83149033bf5ac766d
 2023-10-16 15:34:24 -04:00
Jihoon Kang
6a927ab58b Merge changes from topic "stub_validation" into main am: bc98b4151d am: 8a31dfb8fd am: f62a6384e2 am: c0e328636f am: 1940a51136 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2640275

Change-Id: I0bcc2b37338ea5733c2b8fddfe68a88097bdbb83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-16 18:44:44 +00:00
Jihoon Kang
003f8e6a26 Disable full_api_surface_stubs for some java_api_library modules am: d30ac8a32a am: 7292538264 am: e7c994e61b am: 1c70f0a329 am: dd84f77796 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769782

Change-Id: I1e1d41502a985860e5fe10ed6ee5f729dbecaae3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-16 18:44:38 +00:00
Jiakai Zhang
ba82e28d5d Add assets property for Android apps. 
This property is similar to `asset_dirs`, but for individual files. This
is especially useful when the user wants to pack generated asset files
into the APK.

Bug: 257532944
Test: m nothing
Change-Id: If3062124e9dedb41315dcaf5d379803e5419b8cd
 2023-10-16 18:53:30 +01:00
Jihoon Kang
f62a6384e2 Merge changes from topic "stub_validation" into main am: bc98b4151d am: 8a31dfb8fd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2640275

Change-Id: I8ea4b9c856781c73b2d33d7c25a1367233657428
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-16 17:07:36 +00:00