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

Commit d52d6eb3 authored by SzuWei Lin's avatar SzuWei Lin Committed by android-build-merger
Browse files

Merge "Move common settings in BoardConfig.mk into a common makefile" into oc-mr1-dev 

am: 1f686938

Change-Id: I34be78f55f6b567c4c9d6760cddaaa72b2b8e81a
parents 0fcaeb30 1f686938

target/board/generic_arm64_a/BoardConfig.mk

+1 −44
Original line number Diff line number Diff line
@@ -14,40 +14,7 @@ 
# limitations under the License.

#



# Common boardconfig settings for generic AOSP products targetting mobile

# (phone/table) devices.



# System properties

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



# Bootloader is not part of generic AOSP image

TARGET_NO_BOOTLOADER := true



# Kernel is also not part of generic AOSP image

TARGET_NO_KERNEL := true



# system.img is always ext4 with sparse option

TARGET_USERIMAGES_USE_EXT4 := true

TARGET_USERIMAGES_SPARSE_EXT_DISABLED := false

TARGET_USES_MKE2FS := true



# Enable dex pre-opt to speed up initial boot

ifeq ($(HOST_OS),linux)

  ifeq ($(WITH_DEXPREOPT),)

    WITH_DEXPREOPT := true

    WITH_DEXPREOPT_PIC := true

    ifneq ($(TARGET_BUILD_VARIANT),user)

      # Retain classes.dex in APK's for non-user builds

      DEX_PREOPT_DEFAULT := nostripping

    endif

  endif

endif



# Generic AOSP image always requires separate vendor.img

TARGET_COPY_OUT_VENDOR := vendor



# Generic AOSP image does NOT support HWC1

TARGET_USES_HWC2 := true

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



TARGET_ARCH := arm64

TARGET_ARCH_VARIANT := armv8-a
@@ -60,13 +27,3 @@ TARGET_2ND_ARCH_VARIANT := armv7-a-neon 
TARGET_2ND_CPU_ABI := armeabi-v7a

TARGET_2ND_CPU_ABI2 := armeabi

TARGET_2ND_CPU_VARIANT := generic
 


TARGET_USES_64_BIT_BINDER := true



BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1610612736	# 1.5 GB



# TODO(b/35790399): remove when b/35790399 is fixed.

BOARD_NAND_SPARE_SIZE := 0

BOARD_FLASH_BLOCK_SIZE := 512



BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true

target/board/generic_arm64_ab/BoardConfig.mk

+1 −47
Original line number Diff line number Diff line
@@ -14,41 +14,7 @@ 
# limitations under the License.

#



# Common boardconfig settings for generic AOSP products targetting mobile

# (phone/table) devices.



# System properties

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



# Bootloader is not part of generic AOSP image

TARGET_NO_BOOTLOADER := true



# Kernel is also not part of generic AOSP image

TARGET_NO_KERNEL := true



# system.img is always ext4 with sparse option

TARGET_USERIMAGES_USE_EXT4 := true

TARGET_USERIMAGES_SPARSE_EXT_DISABLED := false

TARGET_USES_MKE2FS := true



# Enable dex pre-opt to speed up initial boot

ifeq ($(HOST_OS),linux)

  ifeq ($(WITH_DEXPREOPT),)

    WITH_DEXPREOPT := true

    WITH_DEXPREOPT_PIC := true

    ifneq ($(TARGET_BUILD_VARIANT),user)

      # Retain classes.dex in APK's for non-user builds

      DEX_PREOPT_DEFAULT := nostripping

    endif

  endif

endif



# Generic AOSP image always requires separate vendor.img

TARGET_COPY_OUT_VENDOR := vendor



# Generic AOSP image does NOT support HWC1

TARGET_USES_HWC2 := true

NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3

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



TARGET_ARCH := arm64

TARGET_ARCH_VARIANT := armv8-a
@@ -63,8 +29,6 @@ TARGET_2ND_CPU_ABI2 := armeabi 
# TODO(jiyong) can we set krait here?

TARGET_2ND_CPU_VARIANT := cortex-a15



TARGET_USES_64_BIT_BINDER := true



# Enable A/B update

TARGET_NO_RECOVERY := true

BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
@@ -73,16 +37,6 @@ BOARD_BUILD_SYSTEM_ROOT_IMAGE := true 
BOARD_ROOT_EXTRA_FOLDERS := bt_firmware firmware firmware/radio persist

BOARD_ROOT_EXTRA_SYMLINKS := /vendor/lib/dsp:/dsp



# TODO(b/35603549): this is currently set to 2.5GB to support sailfish/marlin

# Fix this!

BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648



# TODO(b/35790399): remove when b/35790399 is fixed.

BOARD_NAND_SPARE_SIZE := 0

BOARD_FLASH_BLOCK_SIZE := 512



BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true



# TODO(b/36764215): remove this setting when the generic system image

# no longer has QCOM-specific directories under /.

BOARD_SEPOLICY_DIRS += build/target/board/generic_arm64_ab/sepolicy

target/board/generic_arm_a/BoardConfig.mk

+1 −42
Original line number Diff line number Diff line
@@ -14,51 +14,10 @@ 
# limitations under the License.

#



# Common boardconfig settings for generic AOSP products targetting mobile

# (phone/table) devices.



# System properties

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



# Bootloader is not part of generic AOSP image

TARGET_NO_BOOTLOADER := true



# Kernel is also not part of generic AOSP image

TARGET_NO_KERNEL := true



# system.img is always ext4 with sparse option

TARGET_USERIMAGES_USE_EXT4 := true

TARGET_USERIMAGES_SPARSE_EXT_DISABLED := false

TARGET_USES_MKE2FS := true



# Enable dex pre-opt to speed up initial boot

ifeq ($(HOST_OS),linux)

  ifeq ($(WITH_DEXPREOPT),)

    WITH_DEXPREOPT := true

    WITH_DEXPREOPT_PIC := true

    ifneq ($(TARGET_BUILD_VARIANT),user)

      # Retain classes.dex in APK's for non-user builds

      DEX_PREOPT_DEFAULT := nostripping

    endif

  endif

endif



# Generic AOSP image always requires separate vendor.img

TARGET_COPY_OUT_VENDOR := vendor



# Generic AOSP image does NOT support HWC1

TARGET_USES_HWC2 := true

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



TARGET_ARCH := arm

TARGET_ARCH_VARIANT := armv7-a-neon

TARGET_CPU_ABI := armeabi-v7a

TARGET_CPU_ABI2 := armeabi

TARGET_CPU_VARIANT := generic
 


BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1610612736



# TODO(b/35790399): remove when b/35790399 is fixed.

BOARD_NAND_SPARE_SIZE := 0

BOARD_FLASH_BLOCK_SIZE := 512



BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true

target/board/generic_arm_ab/BoardConfig.mk

+1 −42
Original line number Diff line number Diff line
@@ -14,40 +14,7 @@ 
# limitations under the License.

#



# Common boardconfig settings for generic AOSP products targetting mobile

# (phone/table) devices.



# System properties

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



# Bootloader is not part of generic AOSP image

TARGET_NO_BOOTLOADER := true



# Kernel is also not part of generic AOSP image

TARGET_NO_KERNEL := true



# system.img is always ext4 with sparse option

TARGET_USERIMAGES_USE_EXT4 := true

TARGET_USERIMAGES_SPARSE_EXT_DISABLED := false

TARGET_USES_MKE2FS := true



# Enable dex pre-opt to speed up initial boot

ifeq ($(HOST_OS),linux)

  ifeq ($(WITH_DEXPREOPT),)

    WITH_DEXPREOPT := true

    WITH_DEXPREOPT_PIC := true

    ifneq ($(TARGET_BUILD_VARIANT),user)

      # Retain classes.dex in APK's for non-user builds

      DEX_PREOPT_DEFAULT := nostripping

    endif

  endif

endif



# Generic AOSP image always requires separate vendor.img

TARGET_COPY_OUT_VENDOR := vendor



# Generic AOSP image does NOT support HWC1

TARGET_USES_HWC2 := true

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



TARGET_ARCH := arm

TARGET_ARCH_VARIANT := armv7-a-neon
@@ -58,11 +25,3 @@ TARGET_CPU_VARIANT := generic 
# Enable A/B update

TARGET_NO_RECOVERY := true

BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
 


BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1610612736



# TODO(b/35790399): remove when b/35790399 is fixed.

BOARD_NAND_SPARE_SIZE := 0

BOARD_FLASH_BLOCK_SIZE := 512



BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true

target/board/generic_x86_64_a/BoardConfig.mk

+1 −44
Original line number Diff line number Diff line
@@ -14,40 +14,7 @@ 
# limitations under the License.

#



# Common boardconfig settings for generic AOSP products targetting mobile

# (phone/table) devices.



# System properties

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



# Bootloader is not part of generic AOSP image

TARGET_NO_BOOTLOADER := true



# Kernel is also not part of generic AOSP image

TARGET_NO_KERNEL := true



# system.img is always ext4 with sparse option

TARGET_USERIMAGES_USE_EXT4 := true

TARGET_USERIMAGES_SPARSE_EXT_DISABLED := false

TARGET_USES_MKE2FS := true



# Enable dex pre-opt to speed up initial boot

ifeq ($(HOST_OS),linux)

  ifeq ($(WITH_DEXPREOPT),)

    WITH_DEXPREOPT := true

    WITH_DEXPREOPT_PIC := true

    ifneq ($(TARGET_BUILD_VARIANT),user)

      # Retain classes.dex in APK's for non-user builds

      DEX_PREOPT_DEFAULT := nostripping

    endif

  endif

endif



# Generic AOSP image always requires separate vendor.img

TARGET_COPY_OUT_VENDOR := vendor



# Generic AOSP image does NOT support HWC1

TARGET_USES_HWC2 := true

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



TARGET_CPU_ABI := x86_64

TARGET_ARCH := x86_64
@@ -56,13 +23,3 @@ TARGET_ARCH_VARIANT := x86_64 
TARGET_2ND_CPU_ABI := x86

TARGET_2ND_ARCH := x86

TARGET_2ND_ARCH_VARIANT := x86_64
 


TARGET_USES_64_BIT_BINDER := true



BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1610612736	# 1.5 GB



# TODO(b/35790399): remove when b/35790399 is fixed.

BOARD_NAND_SPARE_SIZE := 0

BOARD_FLASH_BLOCK_SIZE := 512



BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true