From 417fc4f445f813b3f369abf1c6de85df54b4ff9f Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Sun, 19 Mar 2017 19:12:34 -0700 Subject: [PATCH] ENABLE_TREBLE is deprecated ENABLE_TREBLE is deprecated...removing obsolete code fragments related to the flag. Test: marlin boots/works aosp_arm64_ab boots/works on sailfish/marlin Bug: 32978887 Change-Id: I59b4509e4e7ec11cfa138200bccc4418c10b44f3 --- core/envsetup.mk | 5 ----- target/board/generic_arm64_ab/BoardConfig.mk | 6 ------ 2 files changed, 11 deletions(-) diff --git a/core/envsetup.mk b/core/envsetup.mk index eadd316ec5..6b5c4de0a9 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -165,11 +165,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 := ########################################### diff --git a/target/board/generic_arm64_ab/BoardConfig.mk b/target/board/generic_arm64_ab/BoardConfig.mk index 4c57f31e4e..2c3821a4c6 100644 --- a/target/board/generic_arm64_ab/BoardConfig.mk +++ b/target/board/generic_arm64_ab/BoardConfig.mk @@ -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