commit 2ebfef448465b99260b6900bc207d42ead09e96c
author Greg Hartman <ghartman@google.com> Tue Nov 04 21:17:06 2014 -0800
committer Iliyan Malchev <malchev@google.com> Tue Nov 11 02:27:46 2014 +0000
tree 260a837070883d100b185bcbf95fac921bca18b9
parent 4c46710e7a5cbcb1807d183aaeb88d68f98b6753

Restore the diskinstaller dependency, since it's needed for GCE.

Change-Id: Ieb2695afbe551e829357bad56d5fe1501165b495

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index de4a268..7116254 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1242,6 +1242,12 @@
 endif # BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE
 
 # -----------------------------------------------------------------
+# bring in the installer image generation defines if necessary
+ifeq ($(TARGET_USE_DISKINSTALLER),true)
+include bootable/diskinstaller/config.mk
+endif
+
+# -----------------------------------------------------------------
 # host tools needed to build dist and OTA packages
 
 DISTTOOLS :=  $(HOST_OUT_EXECUTABLES)/minigzip \