Treehugger Robot
421ada9627
Merge "JSON format doesn't support comments, so a JSONWithCommentsDecoder is added to support line comments start with // that used in apex_manifest.json files. This fixes the CI errors reported in b/238399517." am: 8322200372
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2147610
Change-Id: I38b04160a1e7a15f2b4fd070558a366979285074
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-11 18:19:54 +00:00
Treehugger Robot
8322200372
Merge "JSON format doesn't support comments, so a JSONWithCommentsDecoder is added to support line comments start with // that used in apex_manifest.json files. This fixes the CI errors reported in b/238399517."
2022-07-11 17:45:18 +00:00
Alexei Nicoara
656399f062
Merge "Replace version 0 with the default version" am: 2971a94e4c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2149073
Change-Id: Iab0a62bca5829017965ad2dfdf85423792ff7733
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-11 09:31:10 +00:00
Alexei Nicoara
2971a94e4c
Merge "Replace version 0 with the default version"
2022-07-11 09:09:56 +00:00
Wei Li
18b7a2e8a2
JSON format doesn't support comments, so a JSONWithCommentsDecoder is added to support line comments start with // that used in apex_manifest.json files. This fixes the CI errors reported in b/238399517.
...
Bug: 238399517
Test: build/bazel/ci/bp2build.sh
Change-Id: Iaa3c2ab319eb7a52cbedaddd057646fc089d745a
2022-07-08 19:14:01 -07:00
Hamzeh Zawawy
5270545c28
Merge "Add ISE requested params to soong bp" am: 4ffb66be38
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2132700
Change-Id: Ie296a97137c05a85085597c8b061205d6fb1ba33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-08 21:15:24 +00:00
Hamzeh Zawawy
4ffb66be38
Merge "Add ISE requested params to soong bp"
2022-07-08 20:53:21 +00:00
Alexei Nicoara
e922d2139d
Replace version 0 with the default version
...
Having 0 as the default version causes problems in flattened apexes and
is being parsed in protobuf as non-existing field. It will be hard to
revert 100 of commits for all the modules. Changing the version in soong
to mitigate time impact.
Test: presubmit, checked .intermediary jsons
Bug: 231691643
Change-Id: I451186d79fd9f8345fd4e28d9daadbfc59047445
2022-07-08 17:38:52 +01:00
Cole Faust
d5ac017c49
Merge "Add -Xjvm-defaults=all to kotlin compilations" am: 01365d5890
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2139092
Change-Id: I71d6538976170f0ac5ebf3e520f853a4fefad3f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-08 05:40:19 +00:00
Cole Faust
01365d5890
Merge "Add -Xjvm-defaults=all to kotlin compilations"
2022-07-08 05:18:22 +00:00
hamzeh
e8a1bfa39f
Add ISE requested params to soong bp
...
The newly added params will be used to help automatically assign bugs
found by fuzzers.
Test: m example_fuzzer
Bug: 236732888
Change-Id: I80e38fae171f8a5798a1495d057bfa6942857c4a
2022-07-07 17:50:57 -07:00
Jiakai Zhang
66926fd455
Merge "Dexpreopt: use "speed-profile" if a system server jar has a profile." am: 4f962e11d2
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2141972
Change-Id: I5605bfcb573ff2aff6b0bf85ddc29e440b71c921
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-07 17:13:28 +00:00
Jiakai Zhang
4f962e11d2
Merge "Dexpreopt: use "speed-profile" if a system server jar has a profile."
2022-07-07 16:57:44 +00:00
Kousik Kumar
5fdcb628a7
Merge "Run expconfigfetcher only when user has proper auth" am: 96cad4cb18
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2147679
Change-Id: I04f8c56a4b53ce85f25c15ddc49e5c39025f46a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-07 14:11:48 +00:00
Kousik Kumar
96cad4cb18
Merge "Run expconfigfetcher only when user has proper auth"
2022-07-07 13:56:17 +00:00
Ulya Trafimovich
6fad1d0dba
Dexpreopt: use "speed-profile" if a system server jar has a profile.
...
The motivation is to reduce file size and in-process memory footprint
for "services" (which is currently the only system server jar that has a
profile). For other system server jars that have no profile keep using
"speed", as enabling "speed-profile" for them would completely disable
AOT-compiled code.
Compare .odex file size:
- before: 44360 services.odex
- after: 24968 services.odex
Bug: b/237399630
Test: lunch aosp_sargo-userdebug && m
Change-Id: I844b9607c496d3d6e7048dc6bb8cd958ecbaa441
2022-07-07 12:12:50 +01:00
Paul Duffin
4057d6455a
Merge "Add apexes property to sdk" am: 0d89b3dc27
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2096447
Change-Id: Ib57f709febd0827967afcd301825d7dae568b67a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-07 10:59:52 +00:00
Paul Duffin
0d89b3dc27
Merge "Add apexes property to sdk"
2022-07-07 10:40:00 +00:00
Cole Faust
306061072d
Merge "Use the current java version for -jvm-target" am: b0353ed3b1
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2139094
Change-Id: I4d06c9105fdef3e24409f1208d019d5e15ad8b53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-07 06:23:31 +00:00
Cole Faust
b0353ed3b1
Merge "Use the current java version for -jvm-target"
2022-07-07 06:08:18 +00:00
Sasha Smundak
18841c3aa6
Clean up bazel_handler.go am: b43ae1eec5
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2144600
Change-Id: I62e8112c4823fe88bde444ac4027a50d25972cf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-07 04:41:23 +00:00
Kousik Kumar
c75e1297a3
Run expconfigfetcher only when user has proper auth
...
It is useless to run this binary when gcert creds aren't available, so
adding a check for gcert creds before calling this binary. Also modified
metrics to capture missing gcert.
Bug: b/237938234
Change-Id: I94b5aa2d53c4e5bb1a5fdc913a33ef5bae965d32
2022-07-07 02:20:51 +00:00
Sasha Smundak
f068e16c33
Handle SymlinkTree action, ignore PythonZipper action. am: c180dbd4c7
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2144599
Change-Id: I62a635529b8e7a10c63ea34d157cfd8bc9d8dcb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 21:08:56 +00:00
Sasha Smundak
ea1f08cc55
Handle WriteFile and SourceSymlinkManifest actions. am: 1da064c1e6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2121035
Change-Id: I696b7b3836f2b8a7b68facd0bd75083fcdc5a59e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 21:08:52 +00:00
Sasha Smundak
c180dbd4c7
Handle SymlinkTree action, ignore PythonZipper action.
...
Introduce bazelBuildRunfiles to build runfiles symlink tree, allowing to
ignore a bogus PythonZipper action.
Bug: 232085015
Test: treehugger
Change-Id: I81267f523d8237fddbc7d65955cdd08ea6369046
2022-07-06 11:30:40 -07:00
Sasha Smundak
b43ae1eec5
Clean up bazel_handler.go
...
Suppress progress and informational messages when invoking Bazel.
Fix Go compiler warnings (unused arguments, etc.)
Test: treehugger
Change-Id: I148bcd200243b4ccb60026264afc4f5b393b82e9
2022-07-06 11:30:40 -07:00
Sasha Smundak
1da064c1e6
Handle WriteFile and SourceSymlinkManifest actions.
...
Plus minor editorial changes.
Bug: 232085015
Test: treehugger
Change-Id: I966e9d6d306382dbb8eac6f8a495a2f152c7a22e
2022-07-06 11:30:40 -07:00
Treehugger Robot
97bc4873db
Merge "Passing default version to zipApex as well" am: 87d74dc54e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2146859
Change-Id: I08367146ccb17bc16ad6d612c1470f850b469955
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 18:21:11 +00:00
Treehugger Robot
87d74dc54e
Merge "Passing default version to zipApex as well"
2022-07-06 17:42:34 +00:00
Paul Duffin
4e7d1c43e2
Add apexes property to sdk
...
Specifying an apex in the apexes propety will cause all the
*classpath_fragments that are contents of the APEX to be automatically
added as members of the sdk and appear in the snapshot.
The purpose of this change is to dedup the APEX and sdk definitions and
try and avoid some of the issues that we have been finding while
attempting to build against the prebuilts.
Two tests, one each for bootclasspath_fragment and
systemserverclasspath_fragment, have been refactored to compare the
output when adding the *fragment to the sdk directly of via the APEX.
That ensures switching to use the APEX will not change the sdk snapshot
unless it was previously missing a *fragment.
There was also a slight difference in where the hidden API flags were
copied from. That should have no impact on the output as the flags are
identical.
The sdk snapshot generation needed some tweaks to avoid generating a
prebuilt for the APEX.
Bug: 232401814
Test: m nothing
Change-Id: I7aaf16a3a0ab4bebf97765d1484215cc008dc4b8
2022-07-06 15:58:43 +00:00
Alexei Nicoara
c939b0181d
Passing default version to zipApex as well
...
Test: presubmit
Bug: 231691643
Change-Id: Ic751d7ea2d23180855897702a03bf1b589d7ef80
2022-07-06 13:56:50 +01:00
Paul Duffin
e942d5d7e9
Merge "Stop exporting systemserverclasspath_fragment when targeting S" am: 014fded49d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2143673
Change-Id: I2ad06eae7d11f1ef9ae7727a5a41052d48fc9e44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-05 17:15:57 +00:00
Paul Duffin
014fded49d
Merge "Stop exporting systemserverclasspath_fragment when targeting S"
2022-07-05 16:44:10 +00:00
Paul Duffin
f861df7907
Stop exporting systemserverclasspath_fragment when targeting S
...
Previously, when targeting the S release the generated sdk snapshot
would contain prebuilt_systemserverclasspath_fragment modules even
though they were only added in T.
This allows SdkMemberTypes to specify the set of target build releases
they support and ignores them when targeting an unsupported target
build release.
Test: m nothing
packages/modules/common/build/mainline_modules_sdks.sh
# Check that the for-S-build snapshots do not include SSCPFs.
Bug: 237718221
Change-Id: I2df08c2fcebf9b866695d691572a9d3783758b17
2022-07-05 15:13:09 +00:00
Treehugger Robot
b11e63c05b
Merge "Remove min_sdk_version allowlist" am: ca51d6e7e6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2138334
Change-Id: Ifa9ab0026e8bf7a73050739f31ebdac35862d836
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-04 14:30:01 +00:00
Treehugger Robot
ca51d6e7e6
Merge "Remove min_sdk_version allowlist"
2022-07-04 14:01:20 +00:00
Cole Faust
2b4402d43f
Merge "Revert^2 "Fix erroneous "Field requires API level 33 (current min is 32)" warnings"" am: 100c7ad7f2
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2143082
Change-Id: I393938d1bf83b8dc734761679fbd5df10caf1c93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 23:06:03 +00:00
Cole Faust
100c7ad7f2
Merge "Revert^2 "Fix erroneous "Field requires API level 33 (current min is 32)" warnings""
2022-07-01 22:48:49 +00:00
Treehugger Robot
c60fc51c0a
Merge "Don't use prebuilt rust stdlibs for linux bionic" am: 4b1fe58b7d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2143993
Change-Id: I74c54e14877ed610febc41cd5f10cefcccedd97d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 20:42:34 +00:00
Treehugger Robot
4b1fe58b7d
Merge "Don't use prebuilt rust stdlibs for linux bionic"
2022-07-01 20:17:01 +00:00
Cole Faust
e5bf3fb4c2
Revert^2 "Fix erroneous "Field requires API level 33 (current min is 32)" warnings"
...
This reverts commit 5d80d895b6
.
Reason for revert: The issue that broke the build the first time this was submitted has been fixed in ag/19125702. Also the errorprone build was added to presubmit for changes to these files so we should hopefully catch any other issues at presubmit now: cl/458501206
Change-Id: I80ca08df49c58a1ad70de917822301368d49fc67
2022-07-01 19:39:14 +00:00
Treehugger Robot
804d04f36d
Merge "Allowlist more cc mainline modules blockers" am: d9cb4b746c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2132795
Change-Id: Id89b82571da8dc904d254cc7f761226106ad45ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 19:10:12 +00:00
Treehugger Robot
d9cb4b746c
Merge "Allowlist more cc mainline modules blockers"
2022-07-01 18:53:07 +00:00
Colin Cross
a8941ec69f
Don't use prebuilt rust stdlibs for linux bionic
...
Linux bionic doesn't have rust stdlib prebuilts, don't use the prebuilts
when it is configured as the host os.
Bug: 216192129
Test: builds
Change-Id: I03425dee4b2e3659bf90c0a0c808cc286daa4b7f
2022-07-01 18:30:17 +00:00
Treehugger Robot
9fe821b0c6
Merge "Don't pass host cross linux musl modules to Make" am: f47fe38686
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2139099
Change-Id: I97e79b3df1e605d20276f06c407a3ce74a1edfd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 17:37:55 +00:00
Treehugger Robot
f47fe38686
Merge "Don't pass host cross linux musl modules to Make"
2022-07-01 17:11:41 +00:00
Liz Kammer
63367e1da9
Allowlist more cc mainline modules blockers
...
Test: mixed_droid.sh
Change-Id: Ice133b88d3420d9b976d1632da3e7e5da6bb5c3c
2022-07-01 12:33:59 -04:00
Treehugger Robot
82a2240a5c
Merge "Remove alternative stl names in bp2build" am: 281d421f41
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2132718
Change-Id: I1b10a03236cc2e83aa627e0b7cf70bbc1a3c74b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 15:11:46 +00:00
Treehugger Robot
281d421f41
Merge "Remove alternative stl names in bp2build"
2022-07-01 14:54:20 +00:00
Alexei Nicoara
663d7560da
Merge "Removing comment lines from apex_manifest.json" am: f6152a161b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2142072
Change-Id: I1009e2d99e417e25e48b24345810f32f5dcaf818
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 14:30:12 +00:00