Paul Scovanner
9e20227ea5
[DO NOT MERGE]
...
Update Security String to 2022-01-05
Bug: 207022948
Change-Id: Ie4afce5ae2b2a1b60fb0fc78ea014d220e08a981
2021-11-22 21:45:58 +00:00
Treehugger Robot
3dd45cab17
Merge "Allow compatibility suite also build a test list" am: 7fe5450be2
am: 30e367dbb4
am: 4d15c8b486
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1844555
Bug: 201591516
Change-Id: Id124e6eb6d5c8c0ec31aca6b5878577519125c30
(cherry picked from commit 10218c724d
)
2021-10-29 21:43:12 +00:00
Paul Scovanner
54f234ae38
[automerger skipped] Update SPL to 2021-12-01 am: ec6022f2e5
am: 38b8a44db6
am: 48181f100e
am: 822db71705
am: a20327484d
-s ours am: 7c3acbad19
-s ours
...
am skip reason: skipped by user pscovanner
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16009632
Change-Id: I1400c62e40573c314b8595e30075fa98c56b562a
2021-10-18 20:35:15 +00:00
Paul Scovanner
7c3acbad19
[automerger skipped] Update SPL to 2021-12-01 am: ec6022f2e5
am: 38b8a44db6
am: 48181f100e
am: 822db71705
am: a20327484d
-s ours
...
am skip reason: skipped by user pscovanner
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16009632
Change-Id: I6e5814a2fcdc75ce8a8e5ad341fa3d27fcbc9cbf
2021-10-18 20:17:01 +00:00
Paul Scovanner
959d1a0691
[automerger skipped] Update SPL to 2021-12-01 am: ec6022f2e5
am: 38b8a44db6
am: 48181f100e
am: 822db71705
am: 1be1ef6734
-s ours am: fd5bf79dfd
-s ours
...
am skip reason: skipped by user pscovanner
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16009632
Change-Id: I2f3de7e815758967f3a3f90426bb37820ad9cbd9
2021-10-18 16:56:05 +00:00
Paul Scovanner
fd5bf79dfd
[automerger skipped] Update SPL to 2021-12-01 am: ec6022f2e5
am: 38b8a44db6
am: 48181f100e
am: 822db71705
am: 1be1ef6734
-s ours
...
am skip reason: skipped by user pscovanner
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16009632
Change-Id: I62f2ae5be48f8952ce01538a4a6be49f295e84e4
2021-10-18 16:34:09 +00:00
Paul Scovanner
a20327484d
Update SPL to 2021-12-01 am: ec6022f2e5
am: 38b8a44db6
am: 48181f100e
am: 822db71705
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16009632
Change-Id: I7693d6ef443a5be9ffce34be50d852cb8c4bdc21
2021-10-12 21:03:47 +00:00
Paul Scovanner
1be1ef6734
Update SPL to 2021-12-01 am: ec6022f2e5
am: 38b8a44db6
am: 48181f100e
am: 822db71705
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16009632
Change-Id: I7e29a87a03bea575453235ccdf6d391e7dc91a60
2021-10-12 21:03:47 +00:00
Paul Scovanner
822db71705
Update SPL to 2021-12-01 am: ec6022f2e5
am: 38b8a44db6
am: 48181f100e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16009632
Change-Id: I869a65437ba0907febbaa2966746f8665113a855
2021-10-12 20:49:57 +00:00
Paul Scovanner
48181f100e
Update SPL to 2021-12-01 am: ec6022f2e5
am: 38b8a44db6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16009632
Change-Id: I468bc3e4cc0f329aff8768e375ae42ee1653c841
2021-10-12 20:39:24 +00:00
Paul Scovanner
38b8a44db6
Update SPL to 2021-12-01 am: ec6022f2e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16009632
Change-Id: Ic290b491b87019fa00d4b6172e438672da23dffd
2021-10-12 20:27:26 +00:00
Paul Scovanner
16eff988ab
[DO NOT MERGE]
...
Update SPL to 2021-12-05
Bug: 202436544
Change-Id: Ib03873315839e4858f93d1ebbbc17054d46246c9
Merged-In: Ic0dabce4beb09bdd966152c059730677ca5bf5aa
2021-10-11 22:57:45 +00:00
Paul Scovanner
ec6022f2e5
Update SPL to 2021-12-01
...
Bug: 202436544
Change-Id: I5f0dea3c6fc94a966c3676cd6ea3cd2684487aff
Merged-In: Ib03873315839e4858f93d1ebbbc17054d46246c9
2021-10-07 21:48:49 +00:00
Colin Cross
2b595c26d1
Merge "Update build_id.mk and version_defaults.mk for SC QPR1" into sc-qpr1-dev
2021-09-29 16:59:52 +00:00
Colin Cross
177cbf600d
Update build_id.mk and version_defaults.mk for SC QPR1
...
Set BUILD_ID to "SC_QPR1", and update DEFAULT_PLATFORM_VERSION to
"SQ1A".
Bug: 201081191
Test: m checkbuild
Change-Id: I1ed59bef262be000bb8c77ed83bb549164a1c39b
Merged-In: I39a82c8ac3fd0b43bad06ec47b85aaeda6ef5cb4
Merged-In: Ie8bed4cefed83db5324ad98b6e70cb69b3f82780
2021-09-24 10:34:43 -07:00
Paul Scovanner
98c2172cb8
[automerger skipped] Update Security String to 2021-11-01 am: bdb63576ff
am: 51b1e117c7
am: 5593bbe1f7
am: e297219ec0
am: 6cbee400fc
-s ours am: 8e6eb662d9
-s ours
...
am skip reason: Merged-In I7e03900c5d853b32f8fbd75cb591063ba4a27450 with SHA-1 0449bb97fa
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15845733
Change-Id: I1f836f3d4fa414b45061f3d0aefbebdc1ebec317
2021-09-17 00:29:41 +00:00
Paul Scovanner
d3882c9027
[automerger skipped] Update Security String to 2021-11-01 am: bdb63576ff
am: 51b1e117c7
am: 5593bbe1f7
am: e297219ec0
am: aae5a4b668
-s ours am: dfe7a28d3f
-s ours
...
am skip reason: Merged-In I7e03900c5d853b32f8fbd75cb591063ba4a27450 with SHA-1 0449bb97fa
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15845733
Change-Id: I36a66aa6b38bdb6220990fce2813ff61a1f0428f
2021-09-17 00:29:37 +00:00
Paul Scovanner
8e6eb662d9
[automerger skipped] Update Security String to 2021-11-01 am: bdb63576ff
am: 51b1e117c7
am: 5593bbe1f7
am: e297219ec0
am: 6cbee400fc
-s ours
...
am skip reason: Merged-In I7e03900c5d853b32f8fbd75cb591063ba4a27450 with SHA-1 0449bb97fa
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15845733
Change-Id: I8106c5d8d22e1098f59f44a94282ec83767add27
2021-09-17 00:18:14 +00:00
Paul Scovanner
dfe7a28d3f
[automerger skipped] Update Security String to 2021-11-01 am: bdb63576ff
am: 51b1e117c7
am: 5593bbe1f7
am: e297219ec0
am: aae5a4b668
-s ours
...
am skip reason: Merged-In I7e03900c5d853b32f8fbd75cb591063ba4a27450 with SHA-1 0449bb97fa
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15845733
Change-Id: I91625dad026b66b4ef2081d9364d9ba1c3d7aa64
2021-09-17 00:17:05 +00:00
Paul Scovanner
aae5a4b668
Update Security String to 2021-11-01 am: bdb63576ff
am: 51b1e117c7
am: 5593bbe1f7
am: e297219ec0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15845733
Change-Id: I028ed970b5886d6a3f6b52359c73f15154b720bf
2021-09-16 23:53:56 +00:00
Paul Scovanner
6cbee400fc
Update Security String to 2021-11-01 am: bdb63576ff
am: 51b1e117c7
am: 5593bbe1f7
am: e297219ec0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15845733
Change-Id: Ie154e0884c9b69e7e5c6f0306b45f5076a604a63
2021-09-16 23:53:56 +00:00
Paul Scovanner
e297219ec0
Update Security String to 2021-11-01 am: bdb63576ff
am: 51b1e117c7
am: 5593bbe1f7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15845733
Change-Id: Ibcb8fb2c1a8b42612f922a3f9e60919f1f8f810e
2021-09-16 23:40:36 +00:00
Paul Scovanner
5593bbe1f7
Update Security String to 2021-11-01 am: bdb63576ff
am: 51b1e117c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15845733
Change-Id: I03c662f3d629a85488189aaf39acd0708ba90f5c
2021-09-16 23:22:02 +00:00
Paul Scovanner
51b1e117c7
Update Security String to 2021-11-01 am: bdb63576ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15845733
Change-Id: Ie3653c7ae59538693a31536196c881903475fabb
2021-09-16 23:04:31 +00:00
Paul Scovanner
bdb63576ff
Update Security String to 2021-11-01
...
Bug: 199784479
Change-Id: Iaf0b0863f6a4e667a5a8f291e1252d8d2dff1ec6
Merged-In: I7e03900c5d853b32f8fbd75cb591063ba4a27450
2021-09-16 19:03:08 +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
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
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
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
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
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
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
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
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
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