Presubmit Automerger Backend
921ed71f1a
[automerger skipped] [automerge] [DO NOT MERGE] 2p: 0449bb97fa
am: 032007da30
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15821927
Change-Id: I5d7a4d12b0ddd788f0c1ffeecd98abdf3c0904cb
2021-09-16 19:01:35 +00:00
Presubmit Automerger Backend
032007da30
[automerge] [DO NOT MERGE] 2p: 0449bb97fa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15821927
Bug: 199784479
Change-Id: Ifa2b7532b7d59bd2b7f9ad87c3a00698cb7c215d
2021-09-16 11:39:22 +00:00
Paul Scovanner
0449bb97fa
[DO NOT MERGE]
...
Update Security String to 2021-11-05
Bug: 199784479
Change-Id: I7e03900c5d853b32f8fbd75cb591063ba4a27450
Merged-In: I7e03900c5d853b32f8fbd75cb591063ba4a27450
2021-09-16 11:39:07 +00:00
TreeHugger Robot
33a7ecce72
Merge "Roll-forward the VNDK snapshot list of GSI" into sc-v2-dev
2021-09-15 01:04:04 +00:00
Presubmit Automerger Backend
9cddbc712c
[automerger skipped] [automerge] Revert "Revert "RESTRICT AUTOMERGE Set BUILD_ID=SC"" 2p: ef1bcc1f9a
am: 6fd648e189
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15798253
Change-Id: I949b94b0946ed3e02d02528e5d07acdd08b1273a
2021-09-14 18:14:10 +00:00
Presubmit Automerger Backend
6fd648e189
[automerge] Revert "Revert "RESTRICT AUTOMERGE Set BUILD_ID=SC"" 2p: ef1bcc1f9a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15798253
Bug: 196178071
Change-Id: Ia03cf697f157a36ad6d0d438d5f901376924e750
2021-09-13 23:45:03 +00:00
Colin Cross
ef1bcc1f9a
Revert "Revert "RESTRICT AUTOMERGE Set BUILD_ID=SC""
...
This reverts commit bf70d0ba2a
.
Reason for revert: camera prebuilt fixed to support short BUILD_ID
Bug: 196178071
Change-Id: Idcb57daf31907f1dff615e180790a2f52462b430
Merged-In: I3b7166d28df6d8828f895f839186de78592d259e
2021-09-13 23:44:53 +00:00
Yi-Yo Chiang
876a3c8934
Roll-forward the VNDK snapshot list of GSI
...
The latest stable SDK version is 31, so add 31 to the list of VNDK
snapshots.
Bug: 196806844
Bug: 198554350
Test: Presubmit
Change-Id: Ia9aab527d9c1fe1d1eb6c72ebc184a3fccad6a22
Merged-In: Ia9aab527d9c1fe1d1eb6c72ebc184a3fccad6a22
2021-09-10 07:14:40 +00:00
Joe Onorato
b04f414eed
Revert "Change function to check MODULE_BUILD_FROM_SOURCE" am: f3055ad6a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15783351
Change-Id: I3e9f50c298a3322fad5f4711539a5656237e3b8e
2021-09-08 09:05:34 +00:00
Cheonho Park
4b609dfc6d
Change function to check MODULE_BUILD_FROM_SOURCE am: 32c048c379
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15692182
Change-Id: I502fb1eea220e579008229876be8426bd9b5b86b
2021-09-08 05:34:19 +00:00
Joe Onorato
f3055ad6a6
Revert "Change function to check MODULE_BUILD_FROM_SOURCE"
...
This reverts commit 32c048c379
.
Reason for revert: Dr. No approved prematurely
Bug: 197282276
Change-Id: I2f7919be20d312227f575a0313a33e7eba11ddff
2021-09-08 05:32:14 +00:00
Cheonho Park
32c048c379
Change function to check MODULE_BUILD_FROM_SOURCE
...
com.google.android.conscrypt is not valid for this
usage as S-OS can have a compressed target by default
(e.g com.google.android.conscrypt_compressed)
Same change applied to com.google.android.art check
Also modify to check `true` value of the MODULE_BUILD_FROM_SOURCE
to filter out both unset variable and `false`
Test: adding one error code temporally, install prebuilt
train, and check result with,without this fix
MODULE_BUILD_FROM_SOURCE := true
+ $(error we are here, true $(PRODUCT_PACKAGES))
endif
Bug: 197282276
Change-Id: I864ba1bb5da61ccc6b8576029ab6c569959b2c93
2021-08-31 02:05:10 +00:00
Presubmit Automerger Backend
f0e17b7b9e
[automerge] Revert "Update Security String to 2021-10-06" 2p: 1f04c4d3e7
am: bbb758b783
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15678276
Change-Id: I6719b3a57e58152bfbbb05d04384448f106f5516
2021-08-26 01:18:33 +00:00
Presubmit Automerger Backend
bbb758b783
[automerge] Revert "Update Security String to 2021-10-06" 2p: 1f04c4d3e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15678276
Bug: 193547118
Change-Id: I3c1d7f852e2295d232e58cfe9499366a863a6404
2021-08-26 01:04:26 +00:00
Paul Scovanner
1f04c4d3e7
Revert "Update Security String to 2021-10-06"
...
This reverts commit 61275cd338
.
Reason for revert: SPL bump no longer necessary due to ATT FRC respin
Bug: 193547118
Change-Id: I1df0e12d50471b518653ff865637193bd7ed9101
2021-08-26 01:04:17 +00:00
Paul Scovanner
8125e52dd7
[automerge] Update Security String to 2021-10-06 2p: 61275cd338
am: 5f9af61fc0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15676633
Change-Id: Icc115e93811d7ab1e24ae4151c3f74945435073b
2021-08-26 00:06:40 +00:00
Paul Scovanner
5f9af61fc0
[automerge] Update Security String to 2021-10-06 2p: 61275cd338
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15676633
Bug: 193547118
Change-Id: Idd4eb6cfec0106c01787e778082757e1e08010da
2021-08-25 20:24:46 +00:00
Paul Scovanner
61275cd338
Update Security String to 2021-10-06
...
Bug: 193547118
Change-Id: I6bbbf0d627c2e978beb28c2fc4ebac142ca63c1e
2021-08-25 20:24:40 +00:00
Paul Scovanner
f9aab50029
[automerger skipped] Update Security String to 2021-10-01 am: f54f3e8118
am: 102502b088
am: 5d40b4be24
am: 12af7082f3
-s ours am: 651c7b8373
-s ours am: 933cc26b88
-s ours am: cdd8ee8dd9
-s ours am: 5b2b805f42
-s ours
...
am skip reason: Merged-In I36d8511d8ab1556af5c278c8d65d7c3ee6f1878d with SHA-1 6ccb50dd3a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15546870
Change-Id: I777cc255fe51768fb0569ffafe5958664d9549b7
2021-08-14 07:50:49 +00:00
Paul Scovanner
6de13ea85a
[automerger skipped] Update Security String to 2021-10-01 am: f54f3e8118
am: 102502b088
am: 5d40b4be24
am: 12af7082f3
-s ours am: 651c7b8373
-s ours am: cfd2f19049
-s ours am: 7b4e958b64
-s ours am: 35099e74fb
-s ours
...
am skip reason: Merged-In I36d8511d8ab1556af5c278c8d65d7c3ee6f1878d with SHA-1 6ccb50dd3a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15546870
Change-Id: I04bed4a41f08f8818787ef09d4fb97dac3d72124
2021-08-14 07:50:46 +00:00
Paul Scovanner
5b2b805f42
[automerger skipped] Update Security String to 2021-10-01 am: f54f3e8118
am: 102502b088
am: 5d40b4be24
am: 12af7082f3
-s ours am: 651c7b8373
-s ours am: 933cc26b88
-s ours am: cdd8ee8dd9
-s ours
...
am skip reason: Merged-In I36d8511d8ab1556af5c278c8d65d7c3ee6f1878d with SHA-1 6ccb50dd3a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15546870
Change-Id: I92c87dbf0add579fe6f3ba15c265f78094c32d3d
2021-08-14 07:38:43 +00:00
Paul Scovanner
35099e74fb
[automerger skipped] Update Security String to 2021-10-01 am: f54f3e8118
am: 102502b088
am: 5d40b4be24
am: 12af7082f3
-s ours am: 651c7b8373
-s ours am: cfd2f19049
-s ours am: 7b4e958b64
-s ours
...
am skip reason: Merged-In I36d8511d8ab1556af5c278c8d65d7c3ee6f1878d with SHA-1 6ccb50dd3a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15546870
Change-Id: Ifae46176f3314c081273b9832f9d40aeb61a8dc8
2021-08-14 07:38:38 +00:00
Paul Scovanner
cdd8ee8dd9
[automerger skipped] Update Security String to 2021-10-01 am: f54f3e8118
am: 102502b088
am: 5d40b4be24
am: 12af7082f3
-s ours am: 651c7b8373
-s ours am: 933cc26b88
-s ours
...
am skip reason: Merged-In I36d8511d8ab1556af5c278c8d65d7c3ee6f1878d with SHA-1 6ccb50dd3a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15546870
Change-Id: I34baec4c5a813b34776c2f7c5b52611a5e8a8de4
2021-08-14 07:27:27 +00:00
Paul Scovanner
7b4e958b64
[automerger skipped] Update Security String to 2021-10-01 am: f54f3e8118
am: 102502b088
am: 5d40b4be24
am: 12af7082f3
-s ours am: 651c7b8373
-s ours am: cfd2f19049
-s ours
...
am skip reason: Merged-In I36d8511d8ab1556af5c278c8d65d7c3ee6f1878d with SHA-1 6ccb50dd3a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15546870
Change-Id: I03ca0b85e6ca48167c0a4788522f8f615f180c0c
2021-08-14 07:26:06 +00:00
Paul Scovanner
933cc26b88
[automerger skipped] Update Security String to 2021-10-01 am: f54f3e8118
am: 102502b088
am: 5d40b4be24
am: 12af7082f3
-s ours am: 651c7b8373
-s ours
...
am skip reason: Merged-In I36d8511d8ab1556af5c278c8d65d7c3ee6f1878d with SHA-1 6ccb50dd3a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15546870
Change-Id: I725fef4165f520ddd2e0fc0fde7f04b7b511aa61
2021-08-14 07:13:17 +00:00
Paul Scovanner
cfd2f19049
[automerger skipped] Update Security String to 2021-10-01 am: f54f3e8118
am: 102502b088
am: 5d40b4be24
am: 12af7082f3
-s ours am: 651c7b8373
-s ours
...
am skip reason: Merged-In I36d8511d8ab1556af5c278c8d65d7c3ee6f1878d with SHA-1 6ccb50dd3a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15546870
Change-Id: If838ff07beb68e32c3a214013744c5f9e6531b72
2021-08-14 07:13:17 +00:00
Paul Scovanner
651c7b8373
[automerger skipped] Update Security String to 2021-10-01 am: f54f3e8118
am: 102502b088
am: 5d40b4be24
am: 12af7082f3
-s ours
...
am skip reason: Merged-In I36d8511d8ab1556af5c278c8d65d7c3ee6f1878d with SHA-1 6ccb50dd3a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15546870
Change-Id: Ibb6e8aee9592986c08223f67b7f9837f950617e8
2021-08-14 06:56:50 +00:00
Paul Scovanner
12af7082f3
Update Security String to 2021-10-01 am: f54f3e8118
am: 102502b088
am: 5d40b4be24
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15546870
Change-Id: I027ad5e4e12ff265d0f4602fedc9aed24ea6ab09
2021-08-14 06:41:03 +00:00
Paul Scovanner
5d40b4be24
Update Security String to 2021-10-01 am: f54f3e8118
am: 102502b088
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15546870
Change-Id: I3b19b07a0ba91e68c0f9a6be4cbc72f410f52b08
2021-08-14 06:22:27 +00:00
Paul Scovanner
102502b088
Update Security String to 2021-10-01 am: f54f3e8118
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15546870
Change-Id: I0425ffbb7a52390fe859920edcfe8097e688c72c
2021-08-14 06:03:39 +00:00
Paul Scovanner
ac2b9f5056
[automerger skipped] Update Security String to 2021-10-01 am: 6ccb50dd3a
am: 10875781bc
-s ours am: 71787e65e7
-s ours am: b849f87cec
-s ours
...
am skip reason: Merged-In I4a0cd58b18214b77302ae7ed81c189f4549dc41d with SHA-1 91cbb67645
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15564069
Change-Id: Icd8aacb2d85e86a735065c6cf3257f5bbfd5463e
2021-08-14 01:28:32 +00:00
Paul Scovanner
f4f46d2d0d
[automerger skipped] Update Security String to 2021-10-01 am: 6ccb50dd3a
am: 3644c700aa
-s ours am: c3aea2a274
-s ours am: 71d33ddc50
-s ours
...
am skip reason: Merged-In I4a0cd58b18214b77302ae7ed81c189f4549dc41d with SHA-1 91cbb67645
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15564069
Change-Id: I13cf2ce6159a566bcba37b4649082c8717147c2e
2021-08-14 01:28:28 +00:00
Paul Scovanner
b849f87cec
[automerger skipped] Update Security String to 2021-10-01 am: 6ccb50dd3a
am: 10875781bc
-s ours am: 71787e65e7
-s ours
...
am skip reason: Merged-In I4a0cd58b18214b77302ae7ed81c189f4549dc41d with SHA-1 91cbb67645
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15564069
Change-Id: I4b92282b9aadd8447f7db509dd213e2516f2f6ac
2021-08-14 01:12:43 +00:00
Paul Scovanner
71d33ddc50
[automerger skipped] Update Security String to 2021-10-01 am: 6ccb50dd3a
am: 3644c700aa
-s ours am: c3aea2a274
-s ours
...
am skip reason: Merged-In I4a0cd58b18214b77302ae7ed81c189f4549dc41d with SHA-1 91cbb67645
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15564069
Change-Id: Iebf09c3f7863337cb411db0c408c5f4f9ffb6901
2021-08-14 01:12:32 +00:00
Paul Scovanner
71787e65e7
[automerger skipped] Update Security String to 2021-10-01 am: 6ccb50dd3a
am: 10875781bc
-s ours
...
am skip reason: Merged-In I4a0cd58b18214b77302ae7ed81c189f4549dc41d with SHA-1 91cbb67645
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15564069
Change-Id: I35ebf437c812ef1eff6d9c14bb9f05898cce066c
2021-08-14 00:58:09 +00:00
Paul Scovanner
c3aea2a274
[automerger skipped] Update Security String to 2021-10-01 am: 6ccb50dd3a
am: 3644c700aa
-s ours
...
am skip reason: Merged-In I4a0cd58b18214b77302ae7ed81c189f4549dc41d with SHA-1 91cbb67645
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15564069
Change-Id: Ib69109d27d8c3dc95fc8175453a189a83b20303c
2021-08-14 00:49:38 +00:00
Paul Scovanner
10875781bc
Update Security String to 2021-10-01 am: 6ccb50dd3a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15564069
Change-Id: I29f80c912c2f84af630db3c94b3b0d3aec18ea63
2021-08-14 00:29:55 +00:00
Paul Scovanner
3644c700aa
Update Security String to 2021-10-01 am: 6ccb50dd3a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15564069
Change-Id: Ic204e600b0b34ad39a50383f17fb74da668c0c9c
2021-08-14 00:29:06 +00:00
Paul Scovanner
6480bac205
Update Security String to 2021-10-05 am: 91cbb67645
am: 4d57439ca8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15559362
Change-Id: I40349f5ed8acd7d7293c3d041c58d81b6f2b4371
2021-08-13 23:25:07 +00:00
Paul Scovanner
f54f3e8118
Update Security String to 2021-10-01
...
Bug: 193547118
Change-Id: I84157c79f00951e9600a2924e6c6fbc497a5e1ef
Merged-In: I36d8511d8ab1556af5c278c8d65d7c3ee6f1878d
2021-08-13 23:19:52 +00:00
Paul Scovanner
6ccb50dd3a
Update Security String to 2021-10-01
...
Bug: 193547118
Change-Id: I36d8511d8ab1556af5c278c8d65d7c3ee6f1878d
Merged-In: I4a0cd58b18214b77302ae7ed81c189f4549dc41d
2021-08-13 23:19:04 +00:00
Paul Scovanner
4d57439ca8
Update Security String to 2021-10-05 am: 91cbb67645
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15559362
Change-Id: Ia85ca367b41fa443237ef12ecd94a1a10bee8c7a
2021-08-13 23:01:36 +00:00
Paul Scovanner
91cbb67645
Update Security String to 2021-10-05
...
Bug: 193547118
Change-Id: I4a0cd58b18214b77302ae7ed81c189f4549dc41d
2021-08-13 19:50:02 +00:00
Anton Hansson
ef5d40b077
[automerger skipped] Merge "Revert "RESTRICT AUTOMERGE Set BUILD_ID=SC"" into sc-dev am: f045b10d7d
am: f9e67251af
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15532764
Change-Id: I20b32eb1bda8bf1b25fe26da411a8e7b9114c7f9
2021-08-12 14:58:38 +00:00
Anton Hansson
db77e437cb
[automerger skipped] Revert "RESTRICT AUTOMERGE Set BUILD_ID=SC" am: bf70d0ba2a
am: f455860afc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15532764
Change-Id: I3445a20facc211b325c99f5076b9dcf052468954
2021-08-12 14:58:38 +00:00
Anton Hansson
f9e67251af
Merge "Revert "RESTRICT AUTOMERGE Set BUILD_ID=SC"" into sc-dev am: f045b10d7d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15532764
Change-Id: I5ce6f6ed4f3116d646d2721267a2ace1000307a2
2021-08-12 14:37:35 +00:00
Anton Hansson
f455860afc
Revert "RESTRICT AUTOMERGE Set BUILD_ID=SC" am: bf70d0ba2a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15532764
Change-Id: I3324b4b623e2654dec30609b94c0b17f02c54be8
2021-08-12 14:37:34 +00:00
Anton Hansson
f045b10d7d
Merge "Revert "RESTRICT AUTOMERGE Set BUILD_ID=SC"" into sc-dev
2021-08-12 14:20:58 +00:00
Anton Hansson
bf70d0ba2a
Revert "RESTRICT AUTOMERGE Set BUILD_ID=SC"
...
This reverts commit 52f0172772
.
Reason for revert: broke bramble boot test
Bug: 196357202
Change-Id: Ib6f05cd323109076cbc6693d16a74cd1d86a6849
2021-08-12 14:19:54 +00:00
Sanket Chinchalkar
7c600bb59f
Merge "Report Performance Test Metrics as JSON File" into sc-dev am: d1bfb2e9ed
am: 228204d820
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15502939
Change-Id: Id85e50300bb3f9af14ffb7ef2880c15a81fc0787
2021-08-12 01:56:31 +00:00