summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEthan Chen <intervigil@gmail.com>2015-11-04 11:59:23 -0800
committerGerrit Code Review <gerrit@cyanogenmod.org>2015-11-05 17:40:00 -0800
commit6a01403d460fc9d977430fd9053565c8446544eb (patch)
tree2055f221ecb2e42d8dab51721abd85986504551d
parentb21ccfd9eba62afe71b1b8aae4f387fe91b822e2 (diff)
downloadbuild-6a01403d460fc9d977430fd9053565c8446544eb.zip
build-6a01403d460fc9d977430fd9053565c8446544eb.tar.gz
build-6a01403d460fc9d977430fd9053565c8446544eb.tar.bz2
build: Don't load dt.img task if custom mkbootimg is used
Change-Id: I7617554a8dc6f44ea0c6a713d834da4fe558caec
-rw-r--r--core/tasks/dt_image.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/tasks/dt_image.mk b/core/tasks/dt_image.mk
index b103046..48a2ce7 100644
--- a/core/tasks/dt_image.mk
+++ b/core/tasks/dt_image.mk
@@ -1,6 +1,7 @@
#----------------------------------------------------------------------
# Generate device tree image (dt.img)
#----------------------------------------------------------------------
+ifeq ($(strip $(BOARD_CUSTOM_BOOTIMG_MK)),)
ifeq ($(strip $(BOARD_KERNEL_SEPARATED_DT)),true)
ifeq ($(strip $(BUILD_TINY_ANDROID)),true)
include device/qcom/common/dtbtool/Android.mk
@@ -32,3 +33,4 @@ $(INSTALLED_DTIMAGE_TARGET): $(DTBTOOL) $(INSTALLED_KERNEL_TARGET)
ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_DTIMAGE_TARGET)
ALL_MODULES.$(LOCAL_MODULE).INSTALLED += $(INSTALLED_DTIMAGE_TARGET)
endif
+endif