StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,365 Commits 1 Branch 0 Tags
00e64f4aa0f9a36094cd795ffa2f3541c54e3152
Commit Graph

58365 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Duffin
00e64f4aa0 Merge "Add apexes property to sdk" am: 0d89b3dc27 am: 4057d6455a am: da014983b3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2096447

Change-Id: I07c339ac6944a586581d46d07820069d7bb1e9a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-07 11:52:03 +00:00
Paul Duffin
da014983b3 Merge "Add apexes property to sdk" am: 0d89b3dc27 am: 4057d6455a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2096447

Change-Id: Ib57550f56945ec48a8643da27aed0210ec05b7f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-07 11:24:37 +00: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
c80656c71f Merge "Use the current java version for -jvm-target" am: b0353ed3b1 am: 306061072d am: 2a63729475 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2139094

Change-Id: I32b49e01fe21b29d66137e340b4681b161f7979d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-07 07:16:19 +00:00
Cole Faust
2a63729475 Merge "Use the current java version for -jvm-target" am: b0353ed3b1 am: 306061072d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2139094

Change-Id: If3069ffd455b37bbff7a9da065207ab359e056e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-07 06:51:27 +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
11c36f14be Clean up bazel_handler.go am: b43ae1eec5 am: 18841c3aa6 am: 493258c598 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2144600

Change-Id: I14b935b96a24343543ddad8f9b3827823a51735d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-07 05:27:08 +00:00
Sasha Smundak
493258c598 Clean up bazel_handler.go am: b43ae1eec5 am: 18841c3aa6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2144600

Change-Id: I630cfc3e22b8df2aeffbd0e38df70164933c0c2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-07 05:01:29 +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
Sasha Smundak
d3fcfb5eee Handle SymlinkTree action, ignore PythonZipper action. am: c180dbd4c7 am: f068e16c33 am: 912aca08ce 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2144599

Change-Id: Ie37aa1fcf3fc66df2edae284d4f8d87829f7b821
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 22:13:48 +00:00
Sasha Smundak
e1e79d6671 Handle WriteFile and SourceSymlinkManifest actions. am: 1da064c1e6 am: ea1f08cc55 am: 0734023e13 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2121035

Change-Id: I378fd37b1656b69967249b319c1cb9b24e0e36ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 22:13:47 +00:00
Kousik Kumar
a8eb36ed22 [automerger skipped] [RESTRICT AUTOMERGE] Cleanup RBE logs directory am: 040867f3b8 -s ours am: 33cc93f02f -s ours am: d0695158c5 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19135647

Change-Id: I4a8836d349470e375dda63a3379e4a58c597cea4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 22:13:27 +00:00
Kousik Kumar
a5d40034e7 [automerger skipped] [RESTRICT AUTOMERGE] Cleanup RBE logs directory am: 040867f3b8 -s ours am: 33cc93f02f -s ours am: 470f93047d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19135647

Change-Id: Ica0d1586519b96d687ecd2dc148279b5bf7ffce4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 22:13:18 +00:00
Sasha Smundak
912aca08ce Handle SymlinkTree action, ignore PythonZipper action. am: c180dbd4c7 am: f068e16c33 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2144599

Change-Id: I9d3d40db2b30b04d3f208eee3398068782d4e98b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 21:36:35 +00:00
Sasha Smundak
0734023e13 Handle WriteFile and SourceSymlinkManifest actions. am: 1da064c1e6 am: ea1f08cc55 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2121035

Change-Id: I5becd0489887ea947a809639fb4ee99562603480
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 21:36:34 +00:00
Kousik Kumar
470f93047d [automerger skipped] [RESTRICT AUTOMERGE] Cleanup RBE logs directory am: 040867f3b8 -s ours am: 33cc93f02f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19135647

Change-Id: I030a835ef661f120aea45cb2affe21f369cb7cc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 21:36:19 +00:00
Kousik Kumar
d0695158c5 [automerger skipped] [RESTRICT AUTOMERGE] Cleanup RBE logs directory am: 040867f3b8 -s ours am: 33cc93f02f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19135647

Change-Id: I5b3c6148c6440d8e3d7e0dfcca197cbd87e89f89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 21:34:52 +00:00
Kousik Kumar
33cc93f02f [automerger skipped] [RESTRICT AUTOMERGE] Cleanup RBE logs directory am: 040867f3b8 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19135647

Change-Id: I662d4c403ec76097fafa6b4be2fe89dcb3ac7f8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 21:16: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
Treehugger Robot
e099d90bd5 Merge "Passing default version to zipApex as well" am: 87d74dc54e am: 97bc4873db am: 52939c2ec8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2146859

Change-Id: I27b67adb0f60e688af53e0a0144379e13d44a359
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 18:56:50 +00:00
Treehugger Robot
52939c2ec8 Merge "Passing default version to zipApex as well" am: 87d74dc54e am: 97bc4873db 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2146859

Change-Id: I3191df663efa82b290aba30e4502c43439bc895c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 18:39:13 +00: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
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
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
a020e9252e Merge "Stop exporting systemserverclasspath_fragment when targeting S" am: 014fded49d am: e942d5d7e9 am: ae382097b3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2143673

Change-Id: Ic84a220493732d642440f98d85fd9b1f44652351
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-05 17:51:51 +00:00
Paul Duffin
ae382097b3 Merge "Stop exporting systemserverclasspath_fragment when targeting S" am: 014fded49d am: e942d5d7e9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2143673

Change-Id: I83c075ebebdee5e508512393d34881fea978d3a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-05 17:34:09 +00: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
f4cd290a0b [automerger skipped] Merge "Remove min_sdk_version allowlist" am: ca51d6e7e6 am: b11e63c05b -s ours am: fe722a28c2 -s ours 
am skip reason: Merged-In Iae3ecb3bfaefc2ee73ed38a9268c68b6673f30c5 with SHA-1 75ed46efb5 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2138334

Change-Id: Ica98d3e3a92664d959d08601bc5217362f7c5d00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-04 15:04:48 +00:00
Treehugger Robot
fe722a28c2 [automerger skipped] Merge "Remove min_sdk_version allowlist" am: ca51d6e7e6 am: b11e63c05b -s ours 
am skip reason: Merged-In Iae3ecb3bfaefc2ee73ed38a9268c68b6673f30c5 with SHA-1 75ed46efb5 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2138334

Change-Id: I13c46b43bf81f44f2d95794af5ee2cc81c859b09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-04 14:49:18 +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
e7e4e9f383 Merge "Revert^2 "Fix erroneous "Field requires API level 33 (current min is 32)" warnings"" am: 100c7ad7f2 am: 2b4402d43f am: 4c944f0d37 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2143082

Change-Id: I79a9e6cc770e056af74b1de23e0f8c549a8a3e6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-01 23:52:36 +00:00
Cole Faust
4c944f0d37 Merge "Revert^2 "Fix erroneous "Field requires API level 33 (current min is 32)" warnings"" am: 100c7ad7f2 am: 2b4402d43f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2143082

Change-Id: I5e9ee2c16b6b822c69dd852b6fb26db3c55814c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-01 23:26:25 +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
48bd565b2f Merge "Don't use prebuilt rust stdlibs for linux bionic" am: 4b1fe58b7d am: c60fc51c0a am: 24a19537fc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2143993

Change-Id: I93770e725d1dfe537fd8a3cf2ffa7c51fcde0a1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-01 21:26:31 +00:00
Treehugger Robot
24a19537fc Merge "Don't use prebuilt rust stdlibs for linux bionic" am: 4b1fe58b7d am: c60fc51c0a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2143993

Change-Id: I1b438b28e983071eb1cf83d005b29a5137e4fd14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-01 21:01:33 +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
Treehugger Robot
78cf2c24e5 Merge "Allowlist more cc mainline modules blockers" am: d9cb4b746c am: 804d04f36d am: a0cd3255ce 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2132795

Change-Id: Ia991cd31e61002dc97b514f4c74d74d4c5471939
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-01 20:09:52 +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