Cole Faust
3dcaf7550f
Use the current java version for -jvm-target
...
This is a partial revert of aosp/541879.
In that cl, the kotlin jvm version was always
set to 1.8 because that's what the kotlin
complier supported at the time, but now
it supports more versions:
$ ./external/kotlinc/bin/kotlinc -jvm-target foo
error: unknown JVM target version: foo
Supported versions: 1.6, 1.8, 9, 10, 11, 12, 13, 14, 15, 16, 17
Bug: 69160377
Bug: 236431222
Test: Treehugger
Change-Id: I273e0b4d1f484013889e17c60bc1b299a3f975a1
2022-10-28 10:07:42 -04:00
Motomu Utsumi
7c255f8aa2
Merge "Revert "update MultiAbiTargeting matching logic"" into tm-qpr-dev
2022-10-19 03:33:43 +00:00
Motomu Utsumi
6c5fae512b
Revert "update MultiAbiTargeting matching logic"
...
This reverts commit 9c94a64e4b
.
Reason for revert: b/254332635 build falure
Change-Id: I4ed1f59fd28ac7bb60939a10d15311cb7a5bfa42
2022-10-19 01:50:10 +00:00
TreeHugger Robot
0749a80679
Merge "update MultiAbiTargeting matching logic" into tm-qpr-dev
2022-10-18 20:41:00 +00:00
Sam Delmerico
9c94a64e4b
update MultiAbiTargeting matching logic
...
The logic here has diverged from the logic in bundletool and resulted in
the wrong APEX variant being chosen for a 64bit-only product.
Bug: 246476965
Test: go test .
Change-Id: Ic3b067e98a65146cfa399e7c9b231f397e51c23e
Merged-In: Ic3b067e98a65146cfa399e7c9b231f397e51c23e
2022-10-18 14:14:26 +00:00
Colin Cross
26d3d71619
Treat kotlin-annotations the same as kotlin-stdlib
...
Upgrading dagger uncovers an issue where java-only modules with
kotlin-containing dependencies may see org.jetbrains.annotations.NotNull
annotations. Include the kotlin-annotations in the output jar the
same way kotlin-stdlib is included.
Bug: 227669740
Test: TestKotlin
Change-Id: Ifc33a32b121c1b9a9d1911bdec332264b78b571c
(cherry picked from commit 063544747e
)
Merged-In: Ifc33a32b121c1b9a9d1911bdec332264b78b571c
2022-10-18 11:23:53 +00:00
Pete Bentley
175515bf04
Merge "Allow BoringSSL's Rust bindings to build" into tm-qpr-dev
2022-10-04 22:10:35 +00:00
Matthew Maurer
e58dac223d
Allow BoringSSL's Rust bindings to build
...
Bug: 177080016
Test: mm in boringssl
Change-Id: I3cdf031ebf7c5bafce00c078107fd7fb3a26ba2d
Merged-In: I3cdf031ebf7c5bafce00c078107fd7fb3a26ba2d
(cherry picked from commit 14f26aaa4e
)
2022-09-30 18:49:58 +01:00
Alan Viverette
234f595cce
Make writing command-line arguments as a comment in the generated file optional
...
Bug: 246630004
Test: ./update_prebuilts.py -x ######
Merged-In: Ic7d5d5ba55f5bba5cc2d0866a7a25f753f3428f8
Change-Id: Ic7d5d5ba55f5bba5cc2d0866a7a25f753f3428f8
2022-09-22 14:40:54 +00:00
Paul Duffin
d31c7fd2b2
Use implementation jar for updatable-media in snapshot for S am: 8a61b59e17
am: cae3f7df50
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19290569
Change-Id: I4d1e4485b79bd9e1193140d645cf103fe3f8c0d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-18 16:01:17 +00:00
Paul Duffin
cae3f7df50
Use implementation jar for updatable-media in snapshot for S am: 8a61b59e17
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19290569
Change-Id: I6facc6153a48d71f6e9f6bbd28588e65435eb92d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-18 15:35:07 +00:00
Paul Duffin
8a61b59e17
Use implementation jar for updatable-media in snapshot for S
...
While enabling prebuilts in T we hit b/229932396 which was caused by
some parts of the build depending on the prebuilt updatable-media jar
which used to be a full implementation jar but which is now an invalid
jar as the snapshot must not be including implementation details. We
fixed the issue in T but we are hitting the same problem in S with the
M-2022-07.
That is the first train in which the prebuilt updatable-media module
provides an invalid jar, prior to that it was always providing an
implementation jar. This change tweaks the sdk snapshot generation
code to use an implementation jar for updatable-media in the S
snapshot to avoid partners having to cherry pick changes similar to
those needed to fix b/229932396 in T.
Bug: 239121291
Test: packages/modules/common/build/mainline_modules_sdks.sh
# Check that S media snapshot includes implementation jar.
# Check that S art snapshot includes invalid jar.
# Check that T media snapshot includes invalid jar.
Change-Id: Ib49484d00a60b4ed7f8268e04f9c10a3498edb56
(cherry picked from commit 1364891fad
)
Merged-In: Ib49484d00a60b4ed7f8268e04f9c10a3498edb56
2022-07-16 00:05:58 +00:00
Christopher Ferris
e494e513ba
Add ability to force compile as 64 bit. am: 3c0ae3317e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19295425
Change-Id: Ie0d782c3524de61065d39956f3c85ccc6701fc7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 20:27:38 +00:00
Christopher Ferris
3c0ae3317e
Add ability to force compile as 64 bit.
...
When trying to build a single 64 bit and 32 bit image, there are
a few executables that are prefer32. When set, this will force all
of those targets to be compiled as 64 bit.
Bug: 229787331
Test: With this option, drmserver/mediaserver are built as 64 bit.
Test: Without this option, drmserver/mediaserver are built as 32 bit.
Change-Id: I1c3dbe229f9b612ff76b857ca7163b14e7dc92c5
Merged-In: I1c3dbe229f9b612ff76b857ca7163b14e7dc92c5
2022-07-15 08:10:05 +00:00
Paul Duffin
340acf4efe
Merge "Stop exporting systemserverclasspath_fragment when targeting S" into tm-dev am: 0147aca453
am: 89b8970a37
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19135262
Change-Id: Ibc75c465f32561b70eb4bb257e012b438afdf27b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-07 17:46:30 +00:00
Paul Duffin
89b8970a37
Merge "Stop exporting systemserverclasspath_fragment when targeting S" into tm-dev am: 0147aca453
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19135262
Change-Id: Ie87896cff0db031d20089bf879898f5382d0458b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-07 17:22:59 +00:00
Paul Duffin
0147aca453
Merge "Stop exporting systemserverclasspath_fragment when targeting S" into tm-dev
2022-07-07 17:03:51 +00:00
Kousik Kumar
ae7ec465d3
[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: Ieb260a566e797cc7e8ca223df4dfa21435182ed5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-06 22:13:15 +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
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
Paul Duffin
b0c28d63d6
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.
The Merged-In value was chosen to prevent this from being merged into
branches where it will conflict due to https://r.android.com/2105804 .
That will allow this change to be submitted in tm-dev before it is
submitted in AOSP.
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
Merged-In: Ib6d1b72bc8399fbb39075494ae37da92f4b28d03
2022-07-05 14:48:09 +00:00
TreeHugger Robot
5cc0cee4f2
[automerger skipped] Merge "Cleanup RBE logs directory" into tm-dev am: 4f7e82f1ce
-s ours am: 014e5a2d11
-s ours
...
am skip reason: Merged-In I46bd38d50419cb9e54e8202d24222979e47ff5ca with SHA-1 29cbe14265
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049999
Change-Id: Icb743b689104bfa18a6ef124ad396b89b605b4c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 18:49:47 +00:00
Kousik Kumar
84ecdb58f9
[automerger skipped] Cleanup RBE logs directory am: c3d9ea5a54
-s ours am: a3caddd060
-s ours
...
am skip reason: Merged-In I46bd38d50419cb9e54e8202d24222979e47ff5ca with SHA-1 29cbe14265
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049999
Change-Id: I229679e6a3f57e15a8f0087a11f0148603905df7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 18:49:46 +00:00
TreeHugger Robot
014e5a2d11
[automerger skipped] Merge "Cleanup RBE logs directory" into tm-dev am: 4f7e82f1ce
-s ours
...
am skip reason: Merged-In I46bd38d50419cb9e54e8202d24222979e47ff5ca with SHA-1 29cbe14265
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049999
Change-Id: I4cc854af8abe2033c5976c9eb4c2957b8e8368d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 18:25:30 +00:00
Kousik Kumar
a3caddd060
[automerger skipped] Cleanup RBE logs directory am: c3d9ea5a54
-s ours
...
am skip reason: Merged-In I46bd38d50419cb9e54e8202d24222979e47ff5ca with SHA-1 29cbe14265
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049999
Change-Id: I14b48f20b24822b251507b83b886fcb8f134b63d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 18:25:29 +00:00
TreeHugger Robot
4f7e82f1ce
Merge "Cleanup RBE logs directory" into tm-dev
2022-06-30 18:01:42 +00:00
Kousik Kumar
040867f3b8
[RESTRICT AUTOMERGE] Cleanup RBE logs directory
...
RBE logs directory is currently messy:
1. We use RBE_output_dir variable to specify where rbe_metrics.txt /
rbe_metrics.pb file should go to.
2. We use proxy_log_dir to specify where *.rpl / *.rpi (detailed per
action info log file) should go to.
3. We use RBE_log_dir to specify where reproxy.* / bootstrap.* log files
should go to.
Ideally, all RBE related logs should go to one single directory. In this
CL, I'm creating a temporary log directory under out/soong/.temp/rbe/
where all RBE related log files per build would go to. The log dir
prefix is also being set to the same prefix as the socket address file.
Test: Ran a sample build with `m libc` and ensured that logs are getting
cleared across rebuilds and that `rbe_metrics.pb` file is properly
generated and being copied to the right location (i.e., from
out/soong/.temp/rbe/<rand> to out/ dir)
Bug: b/233382420
Bug: b/236909178
Bug: b/235861862
Merged-In: I46bd38d50419cb9e54e8202d24222979e47ff5ca
Change-Id: I46bd38d50419cb9e54e8202d24222979e47ff5ca
(cherry picked from commit 29cbe14265
)
2022-06-30 15:20:48 +00:00
William Escande
89bca3f301
Clear apex.go entries for bluetooth libs
...
The module availability to Bluetooth is currently hard-coded in apex.go.
We are in the process of cleaning the apex.go by adding the availability
in each required module
Test: Build + TH + boot phone & use bluetooth
Bug: 216433795
Change-Id: I883a12f89a6d7eb43778e04ac50d6af38dd97116
2022-06-29 01:04:15 +00:00
William Escande
aec111952d
Merge "Clear apex.go entries for bluetooth libs" into tm-qpr-dev
2022-06-28 23:09:56 +00:00
Kousik Kumar
eab1f7027a
[automerger skipped] [RESTRICT AUTOMERGE] Cleanup RBE logs directory am: 29cbe14265
am: 905d2ed5d7
-s ours am: f75e6a131b
-s ours am: 29781b6a41
-s ours am: cd597c12df
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049589
Change-Id: I979b2c1885082e4a03fa347ea370998c98d416f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 19:53:51 +00:00
Kousik Kumar
bf4202fd26
[automerger skipped] Pass along local resource fraction to reproxy am: dbc313375a
am: 3f87c8cd8b
am: 60b79a39f5
-s ours am: 7e0aec24ac
-s ours am: 6a567774f8
-s ours
...
am skip reason: Merged-In I118bc10109f5a55df7a6c1ecd79499320055f2ed with SHA-1 dbc313375a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049588
Change-Id: Icead1d71afb0805b17b1dd5c608d8e80c9e4e450
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 19:51:57 +00:00
Kousik Kumar
360c0ebbbb
[automerger skipped] Do not dump metrics if reproxy was never started am: 5990257d46
am: 1145dd81a7
am: f3d2edfd4b
-s ours am: b107bfb634
-s ours am: 85ae909053
-s ours
...
am skip reason: Merged-In Ic3403331e1f4ac2c7c72fd9169aa7b82a7545c75 with SHA-1 5990257d46
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049587
Change-Id: I72273846e4fe2d5bc972f8fe38a1a3a55e4cc4de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 19:50:02 +00:00
Kousik Kumar
0e9fb73a80
[automerger skipped] [RESTRICT AUTOMERGE] Cleanup RBE logs directory am: 29cbe14265
am: b8a8d8bb2c
-s ours am: a63d2406a6
-s ours am: faf05d15a1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049589
Change-Id: If9543311ff0b9b1b95821435ed32a4800e684505
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 19:48:05 +00:00
Kousik Kumar
a4ae4e02db
[automerger skipped] Pass along local resource fraction to reproxy am: dbc313375a
am: 0db3027fb7
-s ours am: 1a3e516781
-s ours am: 0f808bb577
-s ours
...
am skip reason: Merged-In I118bc10109f5a55df7a6c1ecd79499320055f2ed with SHA-1 35faaef43e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049588
Change-Id: I43185b0fe8a1c75540ddd93b107555d190578e07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 19:46:09 +00:00
Kousik Kumar
31cc63d868
[automerger skipped] Do not dump metrics if reproxy was never started am: 5990257d46
am: 24a39050fd
-s ours am: 3b3b252748
-s ours am: 446732fa22
-s ours
...
am skip reason: Merged-In Ic3403331e1f4ac2c7c72fd9169aa7b82a7545c75 with SHA-1 a1d8fa9961
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049587
Change-Id: I50a473697ea55ccff93c9561b073a6e9fb934666
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 19:42:07 +00:00
Kousik Kumar
cd597c12df
[automerger skipped] [RESTRICT AUTOMERGE] Cleanup RBE logs directory am: 29cbe14265
am: 905d2ed5d7
-s ours am: f75e6a131b
-s ours am: 29781b6a41
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049589
Change-Id: I3d81d14d47afaaebd68b599bd0e642ffe3118c7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 18:48:40 +00:00
Kousik Kumar
6a567774f8
[automerger skipped] Pass along local resource fraction to reproxy am: dbc313375a
am: 3f87c8cd8b
am: 60b79a39f5
-s ours am: 7e0aec24ac
-s ours
...
am skip reason: Merged-In I118bc10109f5a55df7a6c1ecd79499320055f2ed with SHA-1 dbc313375a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049588
Change-Id: Ia535fefa283ec41b568f9a5375a9c0e9a8164671
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 18:48:35 +00:00
Kousik Kumar
85ae909053
[automerger skipped] Do not dump metrics if reproxy was never started am: 5990257d46
am: 1145dd81a7
am: f3d2edfd4b
-s ours am: b107bfb634
-s ours
...
am skip reason: Merged-In Ic3403331e1f4ac2c7c72fd9169aa7b82a7545c75 with SHA-1 5990257d46
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049587
Change-Id: I7bfd461c344f0a3257b6f5671c086369d2fa69c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 18:48:31 +00:00
Kousik Kumar
faf05d15a1
[automerger skipped] [RESTRICT AUTOMERGE] Cleanup RBE logs directory am: 29cbe14265
am: b8a8d8bb2c
-s ours am: a63d2406a6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049589
Change-Id: I70c2e081988142eb3b95312c52bc9267a1c89408
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 18:48:24 +00:00
Kousik Kumar
0f808bb577
[automerger skipped] Pass along local resource fraction to reproxy am: dbc313375a
am: 0db3027fb7
-s ours am: 1a3e516781
-s ours
...
am skip reason: Merged-In I118bc10109f5a55df7a6c1ecd79499320055f2ed with SHA-1 35faaef43e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049588
Change-Id: I932ee0671a5b2268b9282ba505aca6b1eb8dc9a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 18:48:20 +00:00
Kousik Kumar
446732fa22
[automerger skipped] Do not dump metrics if reproxy was never started am: 5990257d46
am: 24a39050fd
-s ours am: 3b3b252748
-s ours
...
am skip reason: Merged-In Ic3403331e1f4ac2c7c72fd9169aa7b82a7545c75 with SHA-1 a1d8fa9961
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049587
Change-Id: I9eb116d54aac7a4a3d4712e74e10a04ce4fb2b96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 18:48:00 +00:00
Kousik Kumar
29781b6a41
[automerger skipped] [RESTRICT AUTOMERGE] Cleanup RBE logs directory am: 29cbe14265
am: 905d2ed5d7
-s ours am: f75e6a131b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049589
Change-Id: I5990530f2640d3c27a25d000d1f013d076ae7393
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 18:46:27 +00:00
Kousik Kumar
7e0aec24ac
[automerger skipped] Pass along local resource fraction to reproxy am: dbc313375a
am: 3f87c8cd8b
am: 60b79a39f5
-s ours
...
am skip reason: Merged-In I118bc10109f5a55df7a6c1ecd79499320055f2ed with SHA-1 dbc313375a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049588
Change-Id: Id20bee6da04d47e745789cf85ba6be85be04427e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 18:46:21 +00:00
Kousik Kumar
b107bfb634
[automerger skipped] Do not dump metrics if reproxy was never started am: 5990257d46
am: 1145dd81a7
am: f3d2edfd4b
-s ours
...
am skip reason: Merged-In Ic3403331e1f4ac2c7c72fd9169aa7b82a7545c75 with SHA-1 5990257d46
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049587
Change-Id: If4f3a1c4d04a2cf8d19b4a7fe82fe830fee576d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 18:46:13 +00:00
Kousik Kumar
f75e6a131b
[automerger skipped] [RESTRICT AUTOMERGE] Cleanup RBE logs directory am: 29cbe14265
am: 905d2ed5d7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049589
Change-Id: I9554aa900081e0d20dcb5c78b79d60e9d32591a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 18:29:55 +00:00
Kousik Kumar
60b79a39f5
Pass along local resource fraction to reproxy am: dbc313375a
am: 3f87c8cd8b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049588
Change-Id: I79014a559f1c48fb34cc62381dc95ca763a0b672
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 18:29:49 +00:00
Kousik Kumar
a63d2406a6
[automerger skipped] [RESTRICT AUTOMERGE] Cleanup RBE logs directory am: 29cbe14265
am: b8a8d8bb2c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049589
Change-Id: Ib02db70a8e86da04606f418952a027f798563708
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 18:29:42 +00:00
Kousik Kumar
1a3e516781
[automerger skipped] Pass along local resource fraction to reproxy am: dbc313375a
am: 0db3027fb7
-s ours
...
am skip reason: Merged-In I118bc10109f5a55df7a6c1ecd79499320055f2ed with SHA-1 35faaef43e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049588
Change-Id: Id2282f6f1150c29c6297c216181ccd933e8e9c28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 18:29:35 +00:00
Kousik Kumar
f3d2edfd4b
Do not dump metrics if reproxy was never started am: 5990257d46
am: 1145dd81a7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049587
Change-Id: Ibdf61b445a1b6b11fb81a8021945e0a849a97a6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 18:29:33 +00:00
Kousik Kumar
3b3b252748
[automerger skipped] Do not dump metrics if reproxy was never started am: 5990257d46
am: 24a39050fd
-s ours
...
am skip reason: Merged-In Ic3403331e1f4ac2c7c72fd9169aa7b82a7545c75 with SHA-1 a1d8fa9961
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049587
Change-Id: I2325c832ab78efcd40b779f665f239ed26baa8d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 18:29:25 +00:00