Commit Graph

78175 Commits

Author SHA1 Message Date
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
Aditya Kumar
22e99ea7cd Merge "Revert "Enable hot cold split"" into main am: f583bafc6e am: 2f1f3e0bf8 am: d0df04160a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2794452

Change-Id: Ib741b16d9eed3017ce8e6c72959e051ec6f00530
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-18 19:18:53 +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
Treehugger Robot
0e2e5d1123 Merge "Remove a number of entries from module denylist" into main am: 6b4fb160ea am: aca5269148 am: 48b4386bab
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2788172

Change-Id: I9ee36d1d65a7bff844b8cf2f53d11aef84ce3d99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-18 19:15:56 +00:00
Colin Cross
8b57d1d786 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: I0c6128f295d7dc4d5031d1ad7d1d4c93a18815f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-18 18:33:07 +00:00
Colin Cross
c292fa1797 Merge "Export resource processor R.jar files to ASfP" into main 2023-10-18 18:24:48 +00:00
Aditya Kumar
d0df04160a Merge "Revert "Enable hot cold split"" into main am: f583bafc6e am: 2f1f3e0bf8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2794452

Change-Id: Ibb9eeeca4628a5b579041374f9fb1b71a0df20f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-18 18:23:30 +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
48b4386bab Merge "Remove a number of entries from module denylist" into main am: 6b4fb160ea am: aca5269148
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2788172

Change-Id: I92fb889dffa8ba81ce0ab73737d8baecb4712c44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-18 18:20:30 +00:00
Aditya Kumar
2f1f3e0bf8 Merge "Revert "Enable hot cold split"" into main am: f583bafc6e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2794452

Change-Id: Ic9c5683ac7f9d0bdfe436550e455230da030c81b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-18 18:19:46 +00:00
Aditya Kumar
f583bafc6e Merge "Revert "Enable hot cold split"" into main 2023-10-18 17:54:32 +00:00
Treehugger Robot
bd9bd6b282 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: I0ffdd8866c532d43d111e49e28c84c637f39eee7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-18 17:50:50 +00:00
Treehugger Robot
aca5269148 Merge "Remove a number of entries from module denylist" into main am: 6b4fb160ea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2788172

Change-Id: Ibd2880b4127f019a1a11c4b5064f0eb4f7cb6b33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-18 17:49:08 +00:00
Usta (Tsering) Shrestha
3800475a9e Merge "Remove unsued mutator registration" into main am: d7471ec5cc am: a8097a501a am: d90f0377d1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2794672

Change-Id: Ie755cae378b236629e1243145e801b2a3419a844
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-18 17:46:01 +00: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
Treehugger Robot
6b4fb160ea Merge "Remove a number of entries from module denylist" into main 2023-10-18 17:16:02 +00:00
Usta (Tsering) Shrestha
d90f0377d1 Merge "Remove unsued mutator registration" into main am: d7471ec5cc am: a8097a501a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2794672

Change-Id: I403d495f2773b0f5d7b580155663e461844470e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-18 16:51:22 +00:00
Usta (Tsering) Shrestha
a8097a501a Merge "Remove unsued mutator registration" into main am: d7471ec5cc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2794672

Change-Id: Icbed650f46d34154156f116e4cda9f0a8e3047ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-18 16:03:21 +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
Usta (Tsering) Shrestha
d7471ec5cc Merge "Remove unsued mutator registration" into main 2023-10-18 15:33:30 +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
9c845e2cf0 Merge changes Iceb0b68f,I04865414 into main am: a855f73f4a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2789776

Change-Id: I294785560843d91d1e17bdd578c83d5480e2660a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-18 14:57:23 +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
Yi Kong
5a48db3b4a Merge "Add additional flag required for Flow Sensitive AFDO" into main am: c1545e8dbf am: 4bc1562a33 am: f9aeb3baaa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2788714

Change-Id: I78ddd75d37fef4fc9cd2ad32300feb09b25fca0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-18 08:50:48 +00:00
Yi Kong
f9aeb3baaa Merge "Add additional flag required for Flow Sensitive AFDO" into main am: c1545e8dbf am: 4bc1562a33
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2788714

Change-Id: Ie084d857aa20ef1a0f321433a3ea60d8c3370ddd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-18 08:18:19 +00:00
Yi Kong
4bc1562a33 Merge "Add additional flag required for Flow Sensitive AFDO" into main am: c1545e8dbf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2788714

Change-Id: I6add8ad32b74484811abf16650a3b4ee23215de2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-18 07:47:13 +00:00
Yi Kong
c1545e8dbf Merge "Add additional flag required for Flow Sensitive AFDO" into main 2023-10-18 07:04:06 +00:00
Vinh Tran
cee8b329e1 Merge "Allowlist rustc-demangle crate" into main am: c6d992e483 am: bbde9b6c6b am: abc9b26c3c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2768331

Change-Id: I15b06d91a44215c6e1b84eafcd67c918b33a1b52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-18 02:02:15 +00:00
Vinh Tran
abc9b26c3c Merge "Allowlist rustc-demangle crate" into main am: c6d992e483 am: bbde9b6c6b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2768331

Change-Id: I975396f76b5ad59a540779d80b1e6a2661a8305d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-18 01:28:44 +00:00
Vinh Tran
bbde9b6c6b Merge "Allowlist rustc-demangle crate" into main am: c6d992e483
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2768331

Change-Id: Ia4d9f770140472c9feb27253e2f99c6e1b35456d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-18 00:41:46 +00:00
Vinh Tran
c6d992e483 Merge "Allowlist rustc-demangle crate" into main 2023-10-18 00:09:41 +00:00
Mateusz Cicheński
c21921b9cf Merge "Revert "Add GENRULE_SANDBOXING=false to non-sandboxed builds"" into main am: 3106df7887 am: 9b243056f4 am: a71cef62cd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2794132

Change-Id: I740202001cd70d2b0c4b53faa69def74b4a6e91e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-17 22:29:09 +00:00
Mateusz Cicheński
a71cef62cd Merge "Revert "Add GENRULE_SANDBOXING=false to non-sandboxed builds"" into main am: 3106df7887 am: 9b243056f4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2794132

Change-Id: I9f06146f41ad274c518e3a162ebc700065356c74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-17 21:37:00 +00:00
Aditya Kumar
b36eaa663b Revert "Enable hot cold split"
This reverts commit 4e28d0eda2.

Reason for revert: Reverting now that we should have sufficient data from Crystalball https://b.corp.google.com/issues/306023954

Change-Id: I9f92c203eda309956ec192432ba0063eb11f59e2
2023-10-17 21:31:45 +00:00
Mateusz Cicheński
9b243056f4 Merge "Revert "Add GENRULE_SANDBOXING=false to non-sandboxed builds"" into main am: 3106df7887
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2794132

Change-Id: Ia58f9152307a87650ffa9c4bef978ba6187a50d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-17 21:07:12 +00:00
Mateusz Cicheński
3106df7887 Merge "Revert "Add GENRULE_SANDBOXING=false to non-sandboxed builds"" into main 2023-10-17 21:04:56 +00:00
Treehugger Robot
15d7946ae1 Merge "Remove unused aquery structs" into main am: 697dfada6e am: 741711dbfa am: c66af65570
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2792054

Change-Id: I3baa7d0ff7004d2fda489a26a31aad15b0efe548
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-17 20:31:12 +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
Treehugger Robot
c66af65570 Merge "Remove unused aquery structs" into main am: 697dfada6e am: 741711dbfa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2792054

Change-Id: I46139e76096e8de76aec9921fe4c3185b1033f8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-17 19:58:20 +00:00
Treehugger Robot
741711dbfa Merge "Remove unused aquery structs" into main am: 697dfada6e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2792054

Change-Id: Iad908ca83b6ff21421d3a834a041f14a1686bf9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-17 19:28:30 +00:00
Cole Faust
d607f94a49 Merge "Remove baseModuleContext.debug" into main am: 03787bea6d am: 6714a42739 am: b231ce9af7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2791447

Change-Id: I58f10f22a9411a3593aa9d0d2b734c285c143297
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-17 19:25:09 +00:00
Usta (Tsering) Shrestha
543f8407ef Remove unsued mutator registration
Bug: 179313531
Change-Id: Ide9fc0a9e1275bb6303c8a3114ce1c4e98915f75
Test: m nothing
2023-10-17 19:20:55 +00:00
Treehugger Robot
697dfada6e Merge "Remove unused aquery structs" into main 2023-10-17 18:27:38 +00:00
Cole Faust
b231ce9af7 Merge "Remove baseModuleContext.debug" into main am: 03787bea6d am: 6714a42739
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2791447

Change-Id: I2e9b1df324770abb1b20039fecbb379d1d2049fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-17 18:12:02 +00:00
Vinh Tran
89d2bbf188 Allowlist rustc-demangle crate
Test: b build //external/rust/crates/rustc-demangle
Test: b build //external/rust/crates/rustc-demangle --config=android
Bug: 297395183
Change-Id: I715377b4bdc296d9676beb0405cc0d544c7d96e9
2023-10-17 13:59:05 -04:00
Cole Faust
6714a42739 Merge "Remove baseModuleContext.debug" into main am: 03787bea6d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2791447

Change-Id: I97e93887133f73e16293d6b017d534df306160d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-17 17:43:23 +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
Mateusz Cicheński
f119ceb1b2 Revert "Add GENRULE_SANDBOXING=false to non-sandboxed builds"
Revert submission 2782270-genrule_sandboxing_by_default

Reason for revert: Potential culprit for b/305851039 and many other build breakages - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:2782270-genrule_sandboxing_by_default

Change-Id: I7b47a92e1b315add65c8018500d9ffbd58f8f1dd
2023-10-17 17:35:52 +00: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