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

7964 Commits

Author SHA1 Message Date
Anton Hansson
4da84d851a Merge "Created empty framework-location non-updatable module" into main am: 05eabd9c4d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2727716

Change-Id: Ia2e05bafe3b12f3366c96e3eef5544ea5a4e4051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-24 12:59:17 +00:00
Anton Hansson
05eabd9c4d Merge "Created empty framework-location non-updatable module" into main 2023-10-24 12:43:36 +00:00
Anton Hansson
2d7bb94e31 Merge "SdkTestCore for non-updatable modules" into main am: af1c929943 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2799773

Change-Id: I181d4003899884ea326b10e1dfe0f4f5feb4c593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-24 10:30:14 +00:00
Anton Hansson
8270d67ad9 Merge "SdkTestCore for non-updatable modules" into main am: af1c929943 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2799773

Change-Id: Ib97c590701670ec8269942541285404f23aea4e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-24 10:28:33 +00:00
Anton Hansson
af1c929943 Merge "SdkTestCore for non-updatable modules" into main 2023-10-24 10:06:54 +00:00
Alan Viverette
248ae6cfd7 Handle Android.bp files in subdirectories of androidx am: ec26327735 am: 97633e43da am: 5a39617a5d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2800134

Change-Id: Ie5b2863cd487973d56b3894bf70a0c32acb3b825
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-23 21:53:20 +00:00
Alan Viverette
f80899cd23 Handle Android.bp files in subdirectories of androidx am: ec26327735 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2800134

Change-Id: I746f4369e68226b86ca8d2bcb13149ef01371422
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-23 21:07:55 +00:00
Alan Viverette
97633e43da Handle Android.bp files in subdirectories of androidx am: ec26327735 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2800134

Change-Id: I466fc52ff56ce2bab213cada9efbeb265a45802d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-23 21:07:07 +00:00
Alix
96ea8845c5 add manifest_values application id property to soong 
Bug:278905106
Test: go test ./java --run TestManifestValuesApplicationIdSetsPackageName
	and locally built a module and checked manifest pacakge_name
Change-Id: I5c8fd27c177b9e255dce197706f62580894008cb
 2023-10-23 18:26:53 +00:00
Alan Viverette
ec26327735 Handle Android.bp files in subdirectories of androidx 
Bug: 304263344
Test: m droid
Change-Id: I473d017ed3169137cc234f7fbd5f01d5ad889cb2
 2023-10-23 13:25:13 -04:00
Mark White
9421c4ceb9 SdkTestCore for non-updatable modules 
Provides SdkTestCore/test_core_current sdk_version for non-updatable
modules that have their test scope dependent on test apis from
framework-minus-apex.

Ignore-AOSP-First: Change in topic with internal-first projects
Bug: 289776578
Test: m checkapi | go test ./java

Merged-In: Iba3213e8c34ea75ac9dd8532a95ef62fb5455e6c
Change-Id: Iba3213e8c34ea75ac9dd8532a95ef62fb5455e6c
 2023-10-23 15:25:55 +00:00
Anas Sulaiman
88c709182c Merge "support toggling compare mode for rbe actions" into main am: f76b3267d5 am: cb1af7d75b am: 53646a8217 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2796314

Change-Id: Ib19677272ab4c591a97c1e7919071206905e036d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-20 15:44:21 +00:00
Anas Sulaiman
5e404e0580 Merge "support toggling compare mode for rbe actions" into main am: f76b3267d5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2796314

Change-Id: Ica21f1662bc955f1030cf6e6775d976a4c2a4419
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-20 15:03:57 +00:00
Anas Sulaiman
cb1af7d75b Merge "support toggling compare mode for rbe actions" into main am: f76b3267d5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2796314

Change-Id: Idb625dae1a2b621b5a15a5d1a4e9872d123bf210
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-20 15:02:15 +00:00
Anas Sulaiman
f76b3267d5 Merge "support toggling compare mode for rbe actions" into main 2023-10-20 14:41:18 +00:00
Jihoon Kang
cdc24a672d Merge "Disable from-text stub build for coverage build" into main am: 04803d4767 am: 89c8d9012c am: eda9671faf 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2789434

Change-Id: I15508f6af1f094d1be5073c62ed7a97b93e826a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-20 00:09:54 +00:00
Jihoon Kang
89c8d9012c 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: I326b3fc11d21ca9e5e3834810ad54dff92668f40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-19 20:00:51 +00:00
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