Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2e9b2b3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Correct some GSI settings to board makefile"

parents 96029a12 83890eb2

target/board/treble_common.mk

+12 −1
Original line number Diff line number Diff line
@@ -53,9 +53,20 @@ TARGET_USES_HWC2 := true 
# Set emulator framebuffer display device buffer count to 3

NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3



BOARD_FLASH_BLOCK_SIZE := 512

# Audio

USE_XML_AUDIO_POLICY_CONF := 1



# b/64700195: add minimum support for odm.img

# Currently odm.img can only be built by `make custom_images`.

# Adding /odm mount point under root directory.

BOARD_ROOT_EXTRA_FOLDERS += odm



# Android Verified Boot (AVB):

#   Builds a special vbmeta.img that disables AVB verification.

#   Otherwise, AVB will prevent the device from booting the generic system.img.

#   Also checks that BOARD_AVB_ENABLE is not set, to prevent adding verity

#   metadata into system.img.

ifeq ($(BOARD_AVB_ENABLE),true)

$(error BOARD_AVB_ENABLE cannot be set for Treble GSI)

endif

BOARD_BUILD_DISABLED_VBMETAIMAGE := true

target/product/treble_common.mk

+0 −12
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ PRODUCT_PACKAGES += vndk_package 
PRODUCT_PACKAGES += \

    libvulkan \



# Audio:

USE_XML_AUDIO_POLICY_CONF := 1

# The following policy XML files are used as fallback for

# vendors/devices not using XML to configure audio policy.

PRODUCT_COPY_FILES += \
@@ -72,16 +70,6 @@ PRODUCT_PACKAGES += \ 
PRODUCT_COPY_FILES += \

    device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml



# Android Verified Boot (AVB):

#   Builds a special vbmeta.img that disables AVB verification.

#   Otherwise, AVB will prevent the device from booting the generic system.img.

#   Also checks that BOARD_AVB_ENABLE is not set, to prevent adding verity

#   metadata into system.img.

ifeq ($(BOARD_AVB_ENABLE),true)

$(error BOARD_AVB_ENABLE cannot be set for Treble GSI)

endif

BOARD_BUILD_DISABLED_VBMETAIMAGE := true



#GSI support for the devices that disable VNDK enforcing

PRODUCT_COPY_FILES += \

    system/core/rootdir/etc/ld.config.txt:system/etc/ld.config.noenforce.txt \