Paul Scovanner
3919de87e4
[automerger skipped] DO NOT MERGE am: d703d4e453
-s ours am: 6be7cf235f
am: f90adf9770
-s ours am: 2ce3a46193
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13326556
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5da86031aaf3423344772f2c511d3f33e3268859
2021-01-13 22:49:14 +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
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
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
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
1be58c9063
[automerger skipped] Update Security String to 2021-03-01 am: 0e3ba7d2f7
am: e1380bb1df
am: f87e56ff8a
am: 785b0ae02e
-s ours am: 6baf089ea3
-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: I80c75ec2fa12865714f8551c2e4dece9acf30432
2021-01-13 00:15:05 +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
6d2ae8eb03
Update Security String to 2021-03-05 am: 9c4665257c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13305148
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I34f0a61e946dcd6c6e8e6b3015d91d9484b2e722
2021-01-11 19:38:40 +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
50d1196dd2
Switch default execution strategy to racing for developer builds am: 524428a647
am: 7a02fa7b79
am: ae8d7801bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13292491
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I77a5aae0a98a3728b9bd554a6948f6a61b747c0d
2021-01-08 20:51:21 +00:00
Kousik Kumar
50c786afe7
Use unified cas uploads / downloads am: a92f3e0804
am: fb2d981a3f
am: ee2bc33f24
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13292490
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I10dd98679fefd07aa629c479d2a660b376ae431d
2021-01-08 20:51:19 +00:00
Kousik Kumar
33d23ad26d
resolve merge conflicts of 0afd707045
to rvc-dev am: 43889572ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13298010
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib1318979aa7519605304e0d035a0423f6af8ad51
2021-01-08 20:51:04 +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
3c0dbc409a
[automerger skipped] Update Security String to 2021-02-01 am: ad7b650e2d
am: ffc4671fce
am: e1b0fa94d3
am: ad55b25e81
-s ours am: 3ab6aebc86
-s ours am: ac631e2014
-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: I56bcb5b41366529983430d40982d1b25482f816a
2020-12-15 00:35:29 +00:00
Paul Scovanner
ac631e2014
[automerger skipped] Update Security String to 2021-02-01 am: ad7b650e2d
am: ffc4671fce
am: e1b0fa94d3
am: ad55b25e81
-s ours am: 3ab6aebc86
-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: Ib9fa44f3eb06da932fc69cc24ececbb0ac82654d
2020-12-15 00:02:23 +00: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
4de5d521ff
Update Security String to 2021-02-05 am: d4d46ab023
am: 02819aefbd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13202277
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I216d8e70e6ebc75f8f4cd5efdb0c9b0190ea7866
2020-12-14 15:46:50 +00:00
Paul Scovanner
02819aefbd
Update Security String to 2021-02-05 am: d4d46ab023
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13202277
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I621f54103d4af96f4118d2b0ea4de9ff4262f652
2020-12-14 14:47:45 +00:00
yawanng
b73d551613
[DO NOT MERGE] iorap: Turn off iorap for R before resolving the regression.
...
Setting 'ro.iorapd.enable' flag will be safter to turn off
IORap for R qpr compared with setting mendel flags.
Bug: 174588448
Test: Make
Change-Id: Ia4b3c3f4108e58847082c9a3b2229bab83fe02c5
2020-12-10 19:32:42 +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
8951d1fdb8
[automerger skipped] Update Security String to 2021-01-01 am: 6441bc7ca3
am: cc0c1b00b6
am: 0f0c87eab7
am: e414401471
am: e4ca3c2ecf
am: 39768724db
-s ours am: b2fe374548
-s ours am: c1b6196a2c
-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: Icf6df3192b1d5cc1180ec76c7d241ce49942cad7
2020-11-19 02:25:45 +00:00
Paul Scovanner
c1b6196a2c
[automerger skipped] Update Security String to 2021-01-01 am: 6441bc7ca3
am: cc0c1b00b6
am: 0f0c87eab7
am: e414401471
am: e4ca3c2ecf
am: 39768724db
-s ours am: b2fe374548
-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: I7e59d0eaa9d91b21045f4908cd56a94fbcc990f0
2020-11-19 02:08:33 +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
0c333b353a
Update Security String to 2021-01-05 am: 643b264940
am: bf81dc0b72
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13074166
Change-Id: I7b5aba3b7055eba717a3ca35600bbee66f0f5bd5
2020-11-18 03:45:43 +00:00
Paul Scovanner
bf81dc0b72
Update Security String to 2021-01-05 am: 643b264940
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13074166
Change-Id: I90382a926a6a4d0197de2842fae5ec9874248870
2020-11-18 03:32:52 +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
Alexander Mishkovets
fa07bff60e
DO NOT MERGE Fix the order of loading OEM properties
...
Move the OEM property imports so that they take higher precedence over
product and can still be overridden by factory properties.
Bug: 171304788
Test: manual
Merged-In: I31f0a582a5c1c55a42fb213c8269b7829aa27b52
Change-Id: I6e17440714e3e5b3a94ec6e1d2f166080513e1a0
2020-11-17 19:36:05 +00:00
Paul Scovanner
4ce3770348
[automerger skipped] Update Security String to 2020-12-01 am: bfe242def7
am: 72b39fb85f
am: c4c139cf8a
am: f96ad85d9d
am: 9d2b3fa3a5
am: edefa3ea53
-s ours am: 3aa4b89bee
-s ours am: 1532de8436
-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: Ib1600ae84fbc11bccce6e938e2b767c3fb7b8861
2020-11-05 19:10:08 +00:00