diff options
| author | Ethan Chen <intervigil@gmail.com> | 2016-04-12 17:03:29 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-04-13 13:09:56 -0700 |
| commit | f31558c416b9fb7a4b1e555aab0c12863d5e9814 (patch) | |
| tree | a8ca3cb5668b1679fb922a1cbbb2dcc5e29393e2 /core/tasks | |
| parent | e7ac98d6826afe6dad141beef85311b36040705f (diff) | |
| download | build-f31558c416b9fb7a4b1e555aab0c12863d5e9814.zip build-f31558c416b9fb7a4b1e555aab0c12863d5e9814.tar.gz build-f31558c416b9fb7a4b1e555aab0c12863d5e9814.tar.bz2 | |
build: Use compatibility DTB directory path for custom DTB tool builds
* dtbToolCM is able to search subdirectories, but we are not guaranteed
that other dtbTool binaries have the same capability. Re-specify
multiple paths for non-dtbToolCM builds just in case.
Change-Id: Id69e000af5eba60a07662b178cb95950451efd17
Diffstat (limited to 'core/tasks')
| -rw-r--r-- | core/tasks/dt_image.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/tasks/dt_image.mk b/core/tasks/dt_image.mk index ca7e87f..a1e8ee7 100644 --- a/core/tasks/dt_image.mk +++ b/core/tasks/dt_image.mk @@ -18,8 +18,13 @@ DTBTOOL := $(HOST_OUT_EXECUTABLES)/$(DTBTOOL_NAME)$(HOST_EXECUTABLE_SUFFIX) INSTALLED_DTIMAGE_TARGET := $(PRODUCT_OUT)/dt.img -# Most specific paths must come first in possible_dtb_dirs +ifeq ($(strip $(TARGET_CUSTOM_DTBTOOL)),) +# dtbToolCM will search subdirectories possible_dtb_dirs = $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/ +else +# Most specific paths must come first in possible_dtb_dirs +possible_dtb_dirs = $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/dts/ $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/ +endif dtb_dir = $(firstword $(wildcard $(possible_dtb_dirs))) define build-dtimage-target |