commit 5c5b443f91da85b84bec36a78dff223ec8b2b3fe
author Greg Hartman <ghartman@google.com> Tue Nov 11 02:55:15 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 11 02:55:15 2014 +0000
tree a5da0e91f4ba7c4bd7cdbddfa0c5ffcb43d41f50
parent 1f4d40be5d9ccaed6e60b2f511b22f8f31a75ef1
parent 711fe35574d5c2f7a668db1ca69a0ce13362fd31

am 711fe355: Add a hook for the syslinux bootloader. automerge: 4c46710

* commit '711fe35574d5c2f7a668db1ca69a0ce13362fd31':
  Add a hook for the syslinux bootloader.

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 25d9c19..77fc32b6 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -491,6 +491,11 @@
 tmp_dir_for_image := $(call intermediates-dir-for,EXECUTABLES,boot_img)/bootimg
 INTERNAL_BOOTIMAGE_ARGS += --tmpdir $(tmp_dir_for_image)
 INTERNAL_BOOTIMAGE_ARGS += --genext2fs $(MKEXT2IMG)
+
+ifeq ($(TARGET_BOOTIMAGE_USE_EXTLINUX),true)
+INTERNAL_BOOTIMAGE_ARGS += --extlinuxconf $(TARGET_BOOTIMAGE_EXTLINUX_CONFIG)
+endif
+
 $(INSTALLED_BOOTIMAGE_TARGET): $(MKEXT2IMG) $(INTERNAL_BOOTIMAGE_FILES)
 	$(call pretty,"Target boot image: $@")
 	$(hide) $(MKEXT2BOOTIMG) $(INTERNAL_BOOTIMAGE_ARGS) --output $@