Commit graph

115 commits

Author SHA1 Message Date
Charlie Chen
935a1dd591 Revert "Switch back from DMABUF to ION/BLOB allocator"
This reverts commit f35c9cb038.
To enable DMABUF again.
Patch: https://android-review.googlesource.com/c/platform/system/memory/libdmabufheap/+/1634146/
fixed the error when using DMABUF

Bug: 153786620
Test: reboot O6 device and confirm the error does not show up again
Change-Id: Id378fe1fe8b9615f72138575cec8e5e1e20caec9
2021-03-16 16:28:15 +08:00
Tianjie Xu
ad661aed61 Merge "Include the Pixel common board configuration" into sc-dev 2021-03-15 18:46:12 +00:00
Daniel Mentz
b494fcea4d Merge "Add vendor_dlkm partition (2nd attempt)" into sc-dev 2021-03-15 18:34:41 +00:00
Tianjie
a76d104aac Include the Pixel common board configuration
In particular, the config builds the hashtree with SHA256 for verified boot
2.0.

Bug: 156162446
Test: build an image, run avbtool info_image
Change-Id: Ib588472434f5df0265d8b457c184272ae4b566fb
2021-03-12 11:42:05 -08:00
Pat Tjin
977ea34b77 Adjust BOARD_GOOGLE_DYNAMIC_PARTITIONS_SIZE to 8527020032
Subtract out 4MiB for overhead.

Test: build
Bug: 182237294
Signed-off-by: Pat Tjin <pattjin@google.com>
Change-Id: Idf07cf518ea0ab8e8586a85303e27538a8ee2885
2021-03-11 23:21:35 -08:00
Daniel Mentz
fc05a5f218 Add vendor_dlkm partition (2nd attempt)
Certain vendor kernel modules were previously stored in the vendor
partition. With this change, we create a new separate partition named
vendor_dlkm for these vendor modules.

Bug: 173653839
Change-Id: I1fc887bdfac958d3a65fb48a4bf7a398e756733e
2021-03-11 22:52:20 -08:00
Chris Fries
0e26f54d1f Merge "Switch back from DMABUF to ION/BLOB allocator" into sc-dev 2021-03-11 23:50:55 +00:00
TreeHugger Robot
10992cb965 Merge "Revert "Revert "Enable chained vbmeta for boot""" into sc-dev 2021-03-11 22:31:19 +00:00
Will McVicker
b5b92eadd1 Revert "Revert "Enable chained vbmeta for boot""
This reverts commit 8ed24f1c7f8923e0b0ac62c16abc5ea32c1a11e0 which
disables chained vbmeta for boot.

Bug: 176930600
Test: manually verify chained vbmeta is enforced
Change-Id: Iba79a072798ff4dd0eb9add3c36d7f6c1ffb4655
2021-03-11 22:30:45 +00:00
Wonsik Kim
f35c9cb038 Switch back from DMABUF to ION/BLOB allocator
Revert of the following changes:
I70af757f5 conf: change a group about dma_heap for video codec
Id4fc2f04b uses dmabufheap on codec2
I090f0491f disable to use BLOB allocator

Bug: 182312949
Test: boot without DMABUF failures
Change-Id: Ibeb05a1341c15a206b8c1d2b9c9765769f6472e1
2021-03-11 13:56:46 -08:00
Petri Gynther
ce5bdb9bd3 Remove vendor partition definitions
Remove vendor partition definitions from:
device/google/gs101/BoardConfig-common.mk

The right place for these definitions is:
vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk

This is necessary for -without-vendor builds.

Bug: 182481577
Test: build oriole-userdebug
Change-Id: Iee6e2964dfca84cc0f40f332067332f7564f6f3b
2021-03-11 10:30:57 -08:00
Cody Schuffelen
815b951c33 Revert "Add vendor_dlkm partition"
Revert "Add vendor_dlkm to AB_OTA_PARTITIONS"

Revert submission 13804535-slider_vendor_dlkm

Reason for revert: Evaluating whether a revert fixes b/182319837
Reverted Changes:
I50887cb75:Add vendor_dlkm to AB_OTA_PARTITIONS
I6e3b20ada:Add vendor_dlkm partition

Change-Id: I71817d8ff65dfb63978dc775178947e12bd1982a
2021-03-10 01:37:58 +00:00
Daniel Mentz
1adeec60ba Add vendor_dlkm partition
Certain vendor kernel modules were previously stored in the vendor
partition. With this change, we create a new separate partition named
vendor_dlkm for these vendor modules.

Bug: 173653839
Change-Id: I6e3b20ada58ffea05de3df8e7eae9fc59a6019e0
2021-03-09 22:48:49 +00:00
Petri Gynther
3c5da8c48b gs101: build vendor_ramdisk.img
aosp/1619809 has landed, so let's start building:
out/target/product/<name>/vendor_ramdisk.img

We can then easily grab ramdisk.img + vendor_ramdisk.img
from any go/ab build to our kernel dev environment.

Bug: 170687803
Change-Id: I1469fd9e545353029ceea6251dad631eab2ae1d9
2021-03-08 10:57:28 -08:00
Robin Peng
c2b5ca99e3 Move slider into gs101 and <device>
from: 026342771c6642980cb4653b1ec4d857a5d8be54

Bug: 167996145
Change-Id: I2ebf7f019afed1cbe9b60dcd82581bd3a52fe109
2021-03-06 16:31:12 +08:00