Commit Graph

75700 Commits

Author SHA1 Message Date
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
04803d4767 Merge "Disable from-text stub build for coverage build" into main 2023-10-19 19:22:33 +00:00
Cole Faust
d3b6d25112 Merge "Add bazel-built modules as deps on the system image" into main am: b2435a464d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2791479

Change-Id: I36444ec48432f35d3151de6f7c7c2bc17734941f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 18:30:47 +00:00
Cole Faust
b2435a464d Merge "Add bazel-built modules as deps on the system image" into main 2023-10-19 18:04:08 +00:00
Xin Li
709e5f5389 Merge "Merge 10952656" into aosp-main-future 2023-10-19 17:58:29 +00:00
Treehugger Robot
84b5c8b496 Merge "Allowlist transitive deps of libnetworkstats" into main am: 786c44f9f3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775984

Change-Id: I884881893cc016b26db992b7efeed8ebe23ee320
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 08:13:49 +00:00
Treehugger Robot
786c44f9f3 Merge "Allowlist transitive deps of libnetworkstats" into main 2023-10-19 07:20:12 +00:00
Cole Faust
2cc9eea91d Merge "gofmt soong" into main am: 14c1ed8d7d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2797038

Change-Id: I0b8868f517905a69338b5085896c9ac19211f7fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 04:21:13 +00:00
Cole Faust
14c1ed8d7d Merge "gofmt soong" into main 2023-10-19 03:48:45 +00:00
Cole Faust
06ea531ab3 gofmt soong
Test: Presubmits
Change-Id: Ia76c35ba51685eca29df51738000eacd3f43ce20
2023-10-18 17:42:59 -07:00
Treehugger Robot
479e1e4f92 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: I1e10e6c0e51430e30823274460ef6d76a802025b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 00:15:52 +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
179503971a Merge "Shard Javac" into main am: eecf47b14c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2768337

Change-Id: I5de4364b39c30b2f60bd2c0e0fb5b9059ee4ace2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-18 22:34:40 +00:00
Chris Parsons
53146465e9 Allowlist fs_msg by package am: c52eb1ce37
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2796832

Change-Id: Ic74cc9f4a18214a7df4db00d8534e992471a0f4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-18 22:33:37 +00:00
Cole Faust
11edf557b6 Add bazel-built modules as deps on the system image
These bazel-built modules will be installed into the system image
as part of the bazel rule, rather than going through the make staging
directory.

Bug: 297269187
Test: m bazel_sandwich
Change-Id: I96c6e58f8e0898b2ad92cb7069745ca2059a39f8
2023-10-18 15:21:14 -07: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
Chris Parsons
c52eb1ce37 Allowlist fs_msg by package
Fixes a build breakage that had a new fs_msg-pkg dependency added. This
would either have to be allowlisted by name, or we'd have to allowlist
the whole package.

Allowlisting the whole package is safer with allowlist v2.

Test: Presubmits
Change-Id: Id3b5c39c60519e966b53ec4fa228c3a79e68fa7a
2023-10-18 19:25:51 +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
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
Spandan Das
6d463cf3e0 Allowlist transitive deps of libnetworkstats
This is a jni lib of FrameworksNetTests

Bug: 297405814
Test: b build $(bmod libnetworkstats) --config=android
Change-Id: Ic5b39615c7c9f193c034d1bc5d92ed9153bb7360
2023-10-18 18:04:08 +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
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
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
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
Usta (Tsering) Shrestha
d7471ec5cc Merge "Remove unsued mutator registration" into main 2023-10-18 15:33:30 +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
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
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
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
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
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
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
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
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
Xin Li
b38b15ca24 Merge 10952656
Merged-In: I9bc9ea2b2760af5b57dd69463658bff3b8e74d9d
Change-Id: Ib253282aaf5fc14e6ea114bcd625c4cc7ebfbc9d
2023-10-17 10:05:50 -07:00
Cole Faust
03787bea6d Merge "Remove baseModuleContext.debug" into main 2023-10-17 16:38:02 +00:00