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
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
ec6022f2e5
Update SPL to 2021-12-01
...
Bug: 202436544
Change-Id: I5f0dea3c6fc94a966c3676cd6ea3cd2684487aff
Merged-In: Ib03873315839e4858f93d1ebbbc17054d46246c9
2021-10-07 21:48:49 +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
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
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
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
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
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
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
61275cd338
Update Security String to 2021-10-06
...
Bug: 193547118
Change-Id: I6bbbf0d627c2e978beb28c2fc4ebac142ca63c1e
2021-08-25 20:24:40 +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
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
91cbb67645
Update Security String to 2021-10-05
...
Bug: 193547118
Change-Id: I4a0cd58b18214b77302ae7ed81c189f4549dc41d
2021-08-13 19:50:02 +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
d1bfb2e9ed
Merge "Report Performance Test Metrics as JSON File" into sc-dev
2021-08-12 01:17:34 +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
bf90be8a65
Merge "Remove MODULE_BUILD_FROM_SOURCE=true for coverage builds" into sc-dev
2021-08-11 07:02:18 +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
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 87f60017b964997e877c8c322f6228c08dcb81ff)
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
Hajime Morrita
ea331d6bcc
Drop pinner.pin_camera=false from the default prop.
...
The pin_camera flag being false makes some in-market devices
(redfin, bramble, coral, etc.) not pin the camera app by default.
Although a Phenotype flag overrides this value,
the OTA flag delivery can fail and ends up non-ping state.
This change makes sure that the device pins the camera app by default
by removing pinner.pin_camera properties modification from this file.
The current default is to pin the camera. See PinnerServices.java
Note that the camera pinning is still disabled on crosshatch family,
sicne it is known to be prone to the memory shortage.
See device-crosshatch.mk.
Also note that some newer devices already pin by default because
they don't refer this file, although the name implies it might.
Test: On Redfin:
$ vendor/google/tools/flashall -w
$ adb root && adb wait-for-device && adb shell am start -a com.android.setupwizard.FOUR_CORNER_EXIT
$ adb shell dumpsys pinner
Bug: 195035033
Bug: 184897981
Change-Id: I81207d0527f758d4800319a3a3c323919daaf814
2021-07-29 15:46:27 -07:00
Mathew Inwood
e24af74376
Add libincident.
...
This library is required by the StatsD apex and including it here ensures
it's always available for use by the apex.
Bug: 192556458
Bug: 160662406
Test: TH
Change-Id: Ia01964d471e4456c05c77c708dee2e71e0121587
2021-07-29 14:59:29 +00:00