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
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
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
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
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
228204d820
Merge "Report Performance Test Metrics as JSON File" into sc-dev am: d1bfb2e9ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15502939
Change-Id: I5d156c9b651aa988f3357995472f837c93476ce1
2021-08-12 01:32:14 +00:00
Sanket Chinchalkar
d1bfb2e9ed
Merge "Report Performance Test Metrics as JSON File" into sc-dev
2021-08-12 01:17:34 +00:00
Matthew Mintz
452c6cca84
RESTRICT AUTOMERGE Set BUILD_ID=SC am: 52f0172772
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15530694
Change-Id: Ib93f7896557a9c92a5ad2bb91100dcb456bb2192
2021-08-11 17:00:33 +00:00
Matthew Mintz
52f0172772
RESTRICT AUTOMERGE Set BUILD_ID=SC
...
Bug: 196178071
Bug: 196043450
Bug: 171506470
Test: adb shell getprop ro.build.fingerprint
Change-Id: I80596f736ce5421530ccaaa035075ceb801a6fe2
2021-08-11 15:09:44 +00:00
Kun Niu
7424feabb5
Merge "Remove MODULE_BUILD_FROM_SOURCE=true for coverage builds" into sc-dev am: bf90be8a65
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15502941
Change-Id: I8a400241f6356e1fca3afb19f6a6df21fae1c7f1
2021-08-11 07:13:03 +00:00
Kun Niu
bf90be8a65
Merge "Remove MODULE_BUILD_FROM_SOURCE=true for coverage builds" into sc-dev
2021-08-11 07:02:18 +00:00
TreeHugger Robot
dbab3c817a
Merge "Adding vendor_boot-test-harness.img" into sc-dev am: e135511f4d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15454001
Change-Id: Ib55cff3765e154df5ff7f0da0203e16d39cfcf58
2021-08-10 02:09:30 +00:00
TreeHugger Robot
e135511f4d
Merge "Adding vendor_boot-test-harness.img" into sc-dev
2021-08-10 01:54:56 +00:00
Spandan Das
170898b9e0
Remove MODULE_BUILD_FROM_SOURCE=true for coverage builds
...
(This is a cherrypick of aosp/1788549)
This flag will be selectively added to build targets if necessary
Bug: 193569756
Test: m nothing
Merged-In: Ie0fd898b03aa91322dddd9137b038031d46c8d24
Change-Id: Ie0fd898b03aa91322dddd9137b038031d46c8d24
2021-08-09 18:22:54 +00:00
Sanket Chinchalkar
ef0a516cc5
Report Performance Test Metrics as JSON File
...
Test: Tested Locally
Bug: 193722630
Change-Id: I113198050e4b0c5242785bc4bbee5fa95c19114d
2021-08-09 09:55:04 -07:00
Kelvin Zhang
7f6869787d
Make apex util detect if hashtree is present am: 45b44d96e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15475434
Change-Id: Iad320a8517523c5268f44e501056cc0b0737e733
2021-08-07 02:54:24 +00:00
Kelvin Zhang
45b44d96e6
Make apex util detect if hashtree is present
...
Test: sign_target_fiels_apks oriole_target_files.zip
Bug: 195194430
Change-Id: I919d169ce4d66e6a1cdbfd15babde25005971a30
2021-08-06 19:38:14 -04:00
SzuWei Lin
bff4b52ce1
Always build modules in GSI from source
...
GSI includes both flattened and unflattened apex at the same time.
However, a flattend apex is not built if the module is built from
prebuilt binary. So, we enable 'MODULE_BUILD_FROM_SOURCE := true'
to force GSI built all modules from source.
Bug: 194917545
Test: build gsi_gms_arm64-user
Test: check com.google.android.art exists in /system/system_ext/apex/
Change-Id: I89eef3e8d06ec1f9d3245513c2dbbff0777e2c62
Merged-In: I89eef3e8d06ec1f9d3245513c2dbbff0777e2c62
2021-08-05 09:47:38 +00:00
Colin Cross
65e3db8e49
Merge "Fix typo for ODM prop files" into sc-dev
2021-08-04 20:05:50 +00:00
Hidefumi Kaneko
9e571609f7
Fix typo for ODM prop files
...
_prop_files is missing a trailing _
Bug: 195034733
Test: manual - check that expected prop files are in the image
Change-Id: Ie042acc74fa56d5515cacd5f41ddc0f82d74f20c
Merged-In: Ie042acc74fa56d5515cacd5f41ddc0f82d74f20c
2021-08-04 20:04:46 +00:00
Hajime Morrita
44c73a61d1
Merge "Drop pinner.pin_camera=false from the default prop." into sc-dev
2021-08-04 18:11:14 +00:00
Bowgo Tsai
3e35c26bf2
Adding vendor_boot-test-harness.img
...
boot-test-harness.img is used to allow adb root on user build
images. It also sets properties: ro.audio.silent=1 & ro.test_harness=1.
GKI 2.0 devices will use BOARD_PREBUILT_BOOTIMAGE so
boot-test-harness.img will not be generated.
Therefore, we have to introduce the vendor_boot-test-harness.img
as an alternative for boot-test-harness.img.
In the future, we'll simplify the flow as:
+ If a device has a /vendor_boot partition, builds
vendor_boot-(test-harness|debug).img.
+ Otherwise, builds boot-(test-harness|debug).img.
boot-(test-harness|debug).img needs to be kept for some clients
to gracefully transit to using vendor_boot-(test-harness|debug).img.
Bug: 194654549
Test: make then `unpack_bootimg --boot_img $OUT/vendor_boot-test-harness.img`
Test: Check the ramdisk content in ./out/vendor_ramdisk
Change-Id: If3a1393b4ff3e69bb9b62f3b843b7858437d47bf
Merged-In: If3a1393b4ff3e69bb9b62f3b843b7858437d47bf
(cherry picked from commit 87f60017b9
)
2021-08-04 10:12:29 +08:00
Roland Levillain
da8d71ea5c
Merge "Work around art-host-tests
build issues when using ART prebuilts." into sc-dev
2021-08-03 16:01:21 +00:00