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

Commit ef8716c9 authored by Steven Moreland's avatar Steven Moreland Committed by Android (Google) Code Review
Browse files

Merge "ENABLE_TREBLE is deprecated" into oc-dev

parents 74e7a2db 417fc4f4

core/envsetup.mk

+0 −5
Original line number Diff line number Diff line
@@ -221,11 +221,6 @@ ifneq ($(MALLOC_IMPL),) 
  $(error Use `MALLOC_SVELTE := true` to configure jemalloc for low-memory)

endif

TARGET_DEVICE_DIR := $(patsubst %/,%,$(dir $(board_config_mk)))

ifneq ($(ENABLE_TREBLE),true)

ifneq ($(BOARD_WRAPS_CONVENTIONAL_HALS),)

$(error BOARD_WRAPS_CONVENTIONAL_HALS cannot be defined when ENABLE_TREBLE is not set to true)

endif

endif

board_config_mk :=



###########################################

target/board/generic_arm64_ab/BoardConfig.mk

+0 −6
Original line number Diff line number Diff line
@@ -47,12 +47,6 @@ TARGET_COPY_OUT_VENDOR := vendor 
# Generic AOSP image does NOT support HWC1

TARGET_USES_HWC2 := true



# TODO(jiyong): Remove these two. These are required in order to remove

# board-specific sysprops from system.img. This should be replaced with

# a more meaningful build flags such as BOARD_SYSPROP_SPLIT.

ENABLE_TREBLE := true

BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4



TARGET_ARCH := arm64

TARGET_ARCH_VARIANT := armv8-a

TARGET_CPU_ABI := arm64-v8a