Merge "Split GSI and mainline board configs"

# BoardConfigGsiCommon.mk

#

# Common compile-time definitions for GSI

# Builds upon the mainline config.

#

# The generic product target doesn't have any hardware-specific pieces.

TARGET_NO_BOOTLOADER := true

TARGET_NO_KERNEL := true

include build/make/target/board/BoardConfigMainlineCommon.mk

# This flag is set by mainline but isn't desired for GSI.

BOARD_USES_SYSTEM_OTHER_ODEX :=

# GSIs always use ext4.

TARGET_USERIMAGES_USE_EXT4 := true

# GSIs are historically released in sparse format.

# Some vendors' bootloaders don't work properly with raw format images. So

# we explicit specify this need below (even though it's the current default).

# over those set by the vendor.

TARGET_SYSTEM_PROP := build/make/target/board/gsi_system.prop

endif

BOARD_VNDK_VERSION := current

# system-as-root is mandatory from Android P

TARGET_NO_RECOVERY := true

BOARD_BUILD_SYSTEM_ROOT_IMAGE := true

# 64 bits binder interface is mandatory from Android P

TARGET_USES_64_BIT_BINDER := true

# Android generic system image always create metadata partition

BOARD_USES_METADATA_PARTITION := true

# The partition size doesn't matter, just to make build pass.

BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4

BOARD_CACHEIMAGE_PARTITION_SIZE := 16777216

# Audio: must using XML format for Treblized devices

USE_XML_AUDIO_POLICY_CONF := 1

# BoardConfigMainlineCommon.mk

#

# Common compile-time definitions for mainline images.

# The generic product target doesn't have any hardware-specific pieces.

TARGET_NO_BOOTLOADER := true

TARGET_NO_KERNEL := true

TARGET_USERIMAGES_USE_EXT4 := true

# system-as-root is mandatory from Android P

TARGET_NO_RECOVERY := true

BOARD_BUILD_SYSTEM_ROOT_IMAGE := true

BOARD_VNDK_VERSION := current

# Required flag for non-64 bit devices from P.

TARGET_USES_64_BIT_BINDER := true

# Puts odex files on system_other, as well as causing dex files not to get

# stripped from APKs.

BOARD_USES_SYSTEM_OTHER_ODEX := true

# Audio: must using XML format for Treblized devices

USE_XML_AUDIO_POLICY_CONF := 1

TARGET_2ND_CPU_ABI2 := armeabi

TARGET_2ND_CPU_VARIANT := generic

# Puts odex files on system_other, as well as causing dex files not to get

# stripped from APKs.

BOARD_USES_SYSTEM_OTHER_ODEX := true

include build/make/target/board/BoardConfigGsiCommon.mk

include build/make/target/board/BoardConfigMainlineCommon.mk