From d17a74eb49e567c5f776fe491942069383b2b94c Mon Sep 17 00:00:00 2001 From: Zhao Wei Liew Date: Sun, 5 Mar 2017 19:17:54 +0800 Subject: build: core: Remove BUILD_TINY_ANDROID checks This flag has been obsolete for a while now. Change-Id: Ib78a1b141ddd757d2546b2eff2158e6e0cc0d673 --- core/generate_extra_images.mk | 4 ---- core/tasks/dt_image.mk | 3 --- 2 files changed, 7 deletions(-) diff --git a/core/generate_extra_images.mk b/core/generate_extra_images.mk index f7fb0c5..664b963 100644 --- a/core/generate_extra_images.mk +++ b/core/generate_extra_images.mk @@ -18,10 +18,8 @@ ifeq ($(TARGET_BOOTIMG_SIGNED),true) INSTALLED_SEC_BOOTIMAGE_TARGET := $(PRODUCT_OUT)/boot.img.secure INSTALLED_SEC_RECOVERYIMAGE_TARGET := $(PRODUCT_OUT)/recovery.img.secure -ifneq ($(BUILD_TINY_ANDROID),true) intermediates := $(call intermediates-dir-for,PACKAGING,recovery_patch) RECOVERY_FROM_BOOT_PATCH := $(intermediates)/recovery_from_boot.p -endif ifndef TARGET_SHA_TYPE TARGET_SHA_TYPE := sha256 @@ -47,10 +45,8 @@ ALL_MODULES.$(LOCAL_MODULE).INSTALLED += $(INSTALLED_SEC_BOOTIMAGE_TARGET) $(INSTALLED_SEC_RECOVERYIMAGE_TARGET): $(INSTALLED_RECOVERYIMAGE_TARGET) $(RECOVERY_FROM_BOOT_PATCH) $(hide) $(call build-sec-image,$(INSTALLED_RECOVERYIMAGE_TARGET)) -ifneq ($(BUILD_TINY_ANDROID),true) ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_SEC_RECOVERYIMAGE_TARGET) ALL_MODULES.$(LOCAL_MODULE).INSTALLED += $(INSTALLED_SEC_RECOVERYIMAGE_TARGET) -endif # !BUILD_TINY_ANDROID endif # TARGET_BOOTIMG_SIGNED #---------------------------------------------------------------------- diff --git a/core/tasks/dt_image.mk b/core/tasks/dt_image.mk index 60d45cc..3bca467 100644 --- a/core/tasks/dt_image.mk +++ b/core/tasks/dt_image.mk @@ -4,9 +4,6 @@ ifeq ($(strip $(BOARD_CUSTOM_BOOTIMG_MK)),) ifeq ($(strip $(BOARD_KERNEL_SEPARATED_DT)),true) ifneq ($(strip $(BOARD_KERNEL_PREBUILT_DT)),true) -ifeq ($(strip $(BUILD_TINY_ANDROID)),true) -include device/qcom/common/dtbtool/Android.mk -endif ifeq ($(strip $(TARGET_CUSTOM_DTBTOOL)),) DTBTOOL_NAME := dtbToolCM -- cgit v1.1