ANDROID: defconfig: Enable DMA-BUF system heap as a module

Unset CONFIG_DMABUF_HEAPS_SYSTEM from gki_defconfig
so that it can be enabled as a vendor module.

This change is intended to allow partners to continue using
device/SoC-specific optimizations in their system heap implementations
when they switch from ION to DMA-BUF heaps. The ION system heap was
built-in and partners were asked to override the system heap ID with
their own if they wanted to override the GKI system heap. This
per-vendor approach to override system heap will no longer be possible
with DMA-BUF heaps since Android S aims to restrict framework access to
DMA-BUF vendor heaps by only letting it access ABI-defined vendor heaps.

VTS tests will be created to ensure that the system heap is present
at /dev/dma_heap/system and behaves as expected of the system heap.

Bug: 175697666
Bug: 155218010
Bug: 172527615

Signed-off-by: Hridya Valsaraju <hridya@google.com>
Change-Id: Id97ed4814517339c69b99f8135e9a66e59d951a9
This commit is contained in:
Hridya Valsaraju
2020-12-21 11:09:12 -08:00
parent dc21b79e92
commit 9ebbf23bfb
3 changed files with 1 additions and 2 deletions

View File

@@ -119,6 +119,7 @@ CONFIG_SOUNDWIRE=m
CONFIG_SOUNDWIRE_QCOM=m
CONFIG_SLIMBUS=m
CONFIG_SLIM_QCOM_NGD_CTRL=m
CONFIG_DMABUF_HEAPS_SYSTEM=m
# CONFIG_CXD2880_SPI_DRV is not set
# CONFIG_MEDIA_TUNER_SIMPLE is not set
# CONFIG_MEDIA_TUNER_TDA18250 is not set

View File

@@ -451,7 +451,6 @@ CONFIG_RTC_DRV_PL030=y
CONFIG_RTC_DRV_PL031=y
CONFIG_DMADEVICES=y
CONFIG_DMABUF_HEAPS=y
CONFIG_DMABUF_HEAPS_SYSTEM=y
CONFIG_UIO=y
CONFIG_VHOST_VSOCK=y
CONFIG_STAGING=y

View File

@@ -401,7 +401,6 @@ CONFIG_LEDS_TRIGGER_TRANSIENT=y
CONFIG_EDAC=y
CONFIG_RTC_CLASS=y
CONFIG_DMABUF_HEAPS=y
CONFIG_DMABUF_HEAPS_SYSTEM=y
CONFIG_UIO=y
CONFIG_VHOST_VSOCK=y
CONFIG_STAGING=y