Paul Scovanner
3361774ae8
[automerger skipped] Update Security String to 2021-05-01 am: 6f23fe1713
am: 74a0816d49
am: 7a1fd130d1
am: d932897da4
-s ours
...
am skip reason: skip tag Change-Id Ica626a3b19e5b642807234c288428cd7e0f40f98 with SHA-1 321db2f846
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13919906
Change-Id: Ifc8531a0881951045dbd0d5148af5486766a2937
2021-03-24 01:13:21 +00:00
Paul Scovanner
d932897da4
Update Security String to 2021-05-01 am: 6f23fe1713
am: 74a0816d49
am: 7a1fd130d1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13919906
Change-Id: If819171b89f0ddd8b72357e0ab8671b1ee741021
2021-03-24 00:30:56 +00:00
Paul Scovanner
7a1fd130d1
Update Security String to 2021-05-01 am: 6f23fe1713
am: 74a0816d49
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13919906
Change-Id: I940aee102ed107695cee2e3820034a2ad748ec35
2021-03-23 23:58:51 +00:00
Paul Scovanner
74a0816d49
Update Security String to 2021-05-01 am: 6f23fe1713
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13919906
Change-Id: I394bbc8fe09f0ef637e82685845e4eca1ba0112e
2021-03-23 23:14:35 +00:00
Paul Scovanner
6f23fe1713
Update Security String to 2021-05-01
...
Bug: 182937985
Change-Id: I72931729126cc997861775051b4b7a69081efcce
Merged-In: Ica626a3b19e5b642807234c288428cd7e0f40f98
2021-03-18 16:43:59 +00:00
Paul Scovanner
321db2f846
DO NOT MERGE
...
Update Security String to 2021-05-05
Bug: 182937985
Change-Id: Ica626a3b19e5b642807234c288428cd7e0f40f98
2021-03-17 20:26:59 +00:00
TreeHugger Robot
a2414b4459
[automerger skipped] Merge "DO NOT MERGE Update OWNERS for SPL changes to version_defaults.mk" into oc-mr1-dev am: 8fd807bb0d
-s ours am: b4a76d1317
-s ours am: 2ff4253b5b
am: b571c86e23
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13326545
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5f0f16b8d8ba32a0eeaca74dfe1a101098f8a39b
2021-01-13 22:18:23 +00:00
Paul Scovanner
2ce3a46193
[automerger skipped] DO NOT MERGE am: d703d4e453
-s ours am: 6be7cf235f
am: f90adf9770
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13326556
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id38a848923de96dc9671e12d5ed2bd8f125f2395
2021-01-13 22:18:12 +00:00
TreeHugger Robot
b571c86e23
[automerger skipped] Merge "DO NOT MERGE Update OWNERS for SPL changes to version_defaults.mk" into oc-mr1-dev am: 8fd807bb0d
-s ours am: b4a76d1317
-s ours am: 2ff4253b5b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13326545
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I643a58a7a943360410b136f8e40d62b89e9a1308
2021-01-13 21:26:09 +00:00
Paul Scovanner
f90adf9770
[automerger skipped] DO NOT MERGE am: d703d4e453
-s ours am: 6be7cf235f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13326556
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie12d51c462daf0df846c34810dd37fe0ad6bd99f
2021-01-13 21:26:02 +00:00
TreeHugger Robot
2ff4253b5b
[automerger skipped] Merge "DO NOT MERGE Update OWNERS for SPL changes to version_defaults.mk" into oc-mr1-dev am: 8fd807bb0d
-s ours am: b4a76d1317
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13326545
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I06a0037560251822d5e21dd53b4f521e1d5929c7
2021-01-13 20:48:03 +00:00
Paul Scovanner
6be7cf235f
[automerger skipped] DO NOT MERGE am: d703d4e453
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13326556
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If6fc2e44aeee6774170036b03be3ff57955eebf5
2021-01-13 20:47:51 +00:00
TreeHugger Robot
b4a76d1317
[automerger skipped] Merge "DO NOT MERGE Update OWNERS for SPL changes to version_defaults.mk" into oc-mr1-dev am: 8fd807bb0d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13326545
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaf980fce1aa4944e6427a383ed6abb3b1c58b401
2021-01-13 20:46:32 +00:00
TreeHugger Robot
8fd807bb0d
Merge "DO NOT MERGE Update OWNERS for SPL changes to version_defaults.mk" into oc-mr1-dev
2021-01-13 20:17:08 +00:00
Paul Scovanner
d703d4e453
DO NOT MERGE
...
Update OWNERS for SPL changes to version_defaults.mk
Bug: 177356215
Change-Id: Icc582400ad03c9d59be0354f53072219be4de65e
2021-01-13 01:02:47 +00:00
Paul Scovanner
bc0038f4c2
DO NOT MERGE
...
Update OWNERS for SPL changes to version_defaults.mk
Bug: 177356215
Change-Id: I4587ab4b0a76fea430c05209002e13ec5152ca1b
2021-01-13 01:02:37 +00:00
Paul Scovanner
6baf089ea3
[automerger skipped] Update Security String to 2021-03-01 am: 0e3ba7d2f7
am: e1380bb1df
am: f87e56ff8a
am: 785b0ae02e
-s ours
...
am skip reason: Change-Id I6d6542306c51ac1682f02cbce6701688d2bdbea2 with SHA-1 9c4665257c
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13318721
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2fb64f180da87c5fb758b19deedd1fde68631dbd
2021-01-12 23:57:49 +00:00
Paul Scovanner
785b0ae02e
Update Security String to 2021-03-01 am: 0e3ba7d2f7
am: e1380bb1df
am: f87e56ff8a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13318721
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ied29b2cc0e2a5e1abc31336b03874019ef814451
2021-01-12 23:03:45 +00:00
Paul Scovanner
f87e56ff8a
Update Security String to 2021-03-01 am: 0e3ba7d2f7
am: e1380bb1df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13318721
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4b3187f2211c7f7f5dd6a766b2d27224dea986ac
2021-01-12 22:46:20 +00:00
Paul Scovanner
e1380bb1df
Update Security String to 2021-03-01 am: 0e3ba7d2f7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13318721
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I409580bb0eeb98a17ca9791d42d8076e8721eb2d
2021-01-12 22:23:58 +00:00
Paul Scovanner
0e3ba7d2f7
Update Security String to 2021-03-01
...
Bug: 177091143
Change-Id: I7cfed298cb518d150ea1f944b57504f9b4578a7b
Merged-In: I6d6542306c51ac1682f02cbce6701688d2bdbea2
2021-01-11 22:24:57 +00:00
Paul Scovanner
9c4665257c
Update Security String to 2021-03-05
...
Bug: 177091143
Change-Id: I6d6542306c51ac1682f02cbce6701688d2bdbea2
2021-01-08 21:53:54 +00:00
Kousik Kumar
ae8d7801bf
Switch default execution strategy to racing for developer builds am: 524428a647
am: 7a02fa7b79
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13292491
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3b81dd98bb24f96ad6491c191f43c041b9fa0885
2021-01-08 20:25:35 +00:00
Kousik Kumar
ee2bc33f24
Use unified cas uploads / downloads am: a92f3e0804
am: fb2d981a3f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13292490
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iff3e0a8deba5b3054f760de183dd3e0f0380a813
2021-01-08 20:25:32 +00:00
Kousik Kumar
43889572ff
resolve merge conflicts of 0afd707045
to rvc-dev
...
Bug: b/170699893
Change-Id: Idfb7f27a3ec12843c53be51e17569583ec6f1f19
2021-01-07 16:19:25 +00:00
Kousik Kumar
7a02fa7b79
Switch default execution strategy to racing for developer builds am: 524428a647
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13292491
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0895a2f8b01c54a852da9cb52a446326b72315d6
2021-01-07 15:33:15 +00:00
Kousik Kumar
fb2d981a3f
Use unified cas uploads / downloads am: a92f3e0804
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13292490
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id75895d8ebe5139c32d1927c862f15429b13e3e3
2021-01-07 15:33:14 +00:00
Patrice Arruda
0afd707045
Source rbesetup.sh from any location inside of a repo directory. am: ba9a28bee2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13292489
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie9fbb1951e8932370b7f5f856a88627f717fc78f
2021-01-07 15:33:11 +00:00
Kousik Kumar
524428a647
Switch default execution strategy to racing for developer builds
...
This is to efficiently use both local and remote resources when using
RBE for Android developers.
Bug: b/170699893
Change-Id: I46bc3ff9c0d8d08e8f3aaa15076eb606737355af
Merged-In: I46bc3ff9c0d8d08e8f3aaa15076eb606737355af
2021-01-06 15:04:13 +00:00
Kousik Kumar
a92f3e0804
Use unified cas uploads / downloads
...
This is to deduplciate uploads and downloads when running builds with
RBE. Especially useful for certain Java / R8 / D8 actions that have JAR
files as common inputs.
Bug: b/170699893
Change-Id: I0459d4e5c89bd93e5c0c53195fdabccabec08674
Merged-In: I0459d4e5c89bd93e5c0c53195fdabccabec08674
2021-01-06 10:00:18 -05:00
Patrice Arruda
ba9a28bee2
Source rbesetup.sh from any location inside of a repo directory.
...
The current rbesetup.sh has to be source from the root directory
of the checked out repo since it has a relative path to the sourced
build/envsetup.sh script. A function was written in rbesetup.sh
script to source the rbesetup.sh script anywhere inside of a
checked out repo. Added additional error checking to validate
the envsetup.sh is available and not to continue sourcing the script
if envsetup.sh script is not found.
Fixes: b/169438960
Test: Sourced the rbesetup script from
* external directory
* inside of a symlink
* outside of repo (sourcing fails which is correct)
* root repo
Change-Id: I2db66a444074adca4d4ab87b8786e9044a3646f8
Merged-In: I2db66a444074adca4d4ab87b8786e9044a3646f8
2021-01-06 09:58:02 -05:00
Paul Scovanner
3ab6aebc86
[automerger skipped] Update Security String to 2021-02-01 am: ad7b650e2d
am: ffc4671fce
am: e1b0fa94d3
am: ad55b25e81
-s ours
...
am skip reason: Change-Id I6a1139d288c24a11289fc53c9022fd6d70acd8e6 with SHA-1 d4d46ab023
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13219376
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibceff73843f7106c5219786032454de44c414f41
2020-12-14 23:24:33 +00:00
Paul Scovanner
ad55b25e81
Update Security String to 2021-02-01 am: ad7b650e2d
am: ffc4671fce
am: e1b0fa94d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13219376
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I46824f2d45d2587956f01104d5e774daaa6b0c42
2020-12-14 23:10:08 +00:00
Paul Scovanner
e1b0fa94d3
Update Security String to 2021-02-01 am: ad7b650e2d
am: ffc4671fce
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13219376
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I258d82e7d0a16c94689806168a7a6b02fcbb7897
2020-12-14 22:52:50 +00:00
Paul Scovanner
ffc4671fce
Update Security String to 2021-02-01 am: ad7b650e2d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13219376
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia1c80993bc1c84ec49fea5d3386e02b91eb8cf06
2020-12-14 22:22:11 +00:00
Paul Scovanner
ad7b650e2d
Update Security String to 2021-02-01
...
Bug: 175313938
Change-Id: I6d6c4a8d4f3e80c40754670ae60718aa42c3265d
Merged-In: I6a1139d288c24a11289fc53c9022fd6d70acd8e6
2020-12-14 19:49:31 +00:00
Paul Scovanner
d4d46ab023
Update Security String to 2021-02-05
...
Bug: 175313938
Change-Id: I6a1139d288c24a11289fc53c9022fd6d70acd8e6
2020-12-10 18:23:46 +00:00
Paul Scovanner
b2fe374548
[automerger skipped] Update Security String to 2021-01-01 am: 6441bc7ca3
am: cc0c1b00b6
am: 0f0c87eab7
am: e414401471
am: e4ca3c2ecf
am: 39768724db
-s ours
...
am skip reason: Change-Id I273073a04d6981c5a58b3aebdf13249fdb46586e with SHA-1 643b264940
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13074489
Change-Id: I5eb8a86918aec64ae8f46d04e507827c7816d6af
2020-11-19 01:14:43 +00:00
Paul Scovanner
39768724db
Update Security String to 2021-01-01 am: 6441bc7ca3
am: cc0c1b00b6
am: 0f0c87eab7
am: e414401471
am: e4ca3c2ecf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13074489
Change-Id: I3ae8240a83bf652ab60d3b32d94065be36b1121b
2020-11-19 00:59:59 +00:00
Paul Scovanner
e4ca3c2ecf
Update Security String to 2021-01-01 am: 6441bc7ca3
am: cc0c1b00b6
am: 0f0c87eab7
am: e414401471
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13074489
Change-Id: I5c255d9e92050a94aebe9d12601afc98c19662ae
2020-11-19 00:37:59 +00:00
Paul Scovanner
e414401471
Update Security String to 2021-01-01 am: 6441bc7ca3
am: cc0c1b00b6
am: 0f0c87eab7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13074489
Change-Id: Idff81ff223358716a5c0404deda79ea07baf066b
2020-11-18 23:47:52 +00:00
Paul Scovanner
0f0c87eab7
Update Security String to 2021-01-01 am: 6441bc7ca3
am: cc0c1b00b6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13074489
Change-Id: Iab2faef2dcaaba49ff479003b35d5d9ff703c9b1
2020-11-18 23:34:54 +00:00
Paul Scovanner
cc0c1b00b6
Update Security String to 2021-01-01 am: 6441bc7ca3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13074489
Change-Id: I489da5f003acbd32d027cb512c7343e83a9dc144
2020-11-18 23:17:46 +00:00
Paul Scovanner
6441bc7ca3
Update Security String to 2021-01-01
...
Bug: 173545603
Change-Id: If6e59e48439ca692650a6ad7ad23535a8576a585
Merged-In: I273073a04d6981c5a58b3aebdf13249fdb46586e
2020-11-18 01:39:12 +00:00
Paul Scovanner
643b264940
Update Security String to 2021-01-05
...
Bug: 173545603
Change-Id: I273073a04d6981c5a58b3aebdf13249fdb46586e
2020-11-17 23:14:24 +00:00
Paul Scovanner
3aa4b89bee
[automerger skipped] Update Security String to 2020-12-01 am: bfe242def7
am: 72b39fb85f
am: c4c139cf8a
am: f96ad85d9d
am: 9d2b3fa3a5
am: edefa3ea53
-s ours
...
am skip reason: Change-Id I61eac7915ab4b23227c3263d3f33a0f71dc3a107 with SHA-1 29d48ffac5
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12804958
Change-Id: I97944db4a1b0241947b1f181234db1fa0d6c642a
2020-11-05 18:50:06 +00:00
Paul Scovanner
c581e2d9bb
[automerger skipped] Update Security String to 2020-11-01 am: efacba8eef
am: ec316d384e
am: ee7f20037f
am: fad16b3034
am: 7490ed5cee
am: 7786db2615
-s ours
...
am skip reason: Change-Id I96489891caa4f5248c90be2d8c16327e1991e3bb with SHA-1 727715f100
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12617844
Change-Id: I3d35b239bc1912ccc6fa8c3ae91b9b79498798b9
2020-11-05 18:49:59 +00:00
Paul Scovanner
9d5a66feb3
[automerger skipped] resolve merge conflicts of 47ba91cd62
to qt-qpr1-dev am: 952f59cccd
-s ours
...
am skip reason: skipped by user pscovanner
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12992996
Change-Id: I2a8c940a112c54a90de0972d1f08a86f46d347ad
2020-11-05 18:49:45 +00:00
Paul Scovanner
edefa3ea53
Update Security String to 2020-12-01 am: bfe242def7
am: 72b39fb85f
am: c4c139cf8a
am: f96ad85d9d
am: 9d2b3fa3a5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12804958
Change-Id: I078d443bca5896c8ff7a3e9472b2b7b3bb8b25df
2020-11-05 17:10:27 +00:00
Paul Scovanner
7786db2615
Update Security String to 2020-11-01 am: efacba8eef
am: ec316d384e
am: ee7f20037f
am: fad16b3034
am: 7490ed5cee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12617844
Change-Id: I6ac787306129ba452b9b73588bc1f72fa93dbf35
2020-11-05 17:10:16 +00:00