summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2020-07-22 11:39:34 -0700
committerDmitry Shmidt <dimitrysh@google.com>2020-07-22 12:50:44 -0700
commit06c9f4b6eb2a9c62ffb095907f7bbaa38f0c9600 (patch)
treee7d5b5fd8ddefbd11de7ad654cde3dc2ea93bd2f
parent9305c61f0cbbde534ea65daa2b5738204c8f457d (diff)
downloadyukawa-06c9f4b6eb2a9c62ffb095907f7bbaa38f0c9600.tar.gz
yukawa: Use mkdtboimg.py instead of depricated mkdtimg
Bug: 161792907 Test: make -j24 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> Change-Id: I3f60cc1495a8251dda90cf78144c8efeadd6e152
-rw-r--r--build/tasks/dtimages.mk10
1 files changed, 6 insertions, 4 deletions
diff --git a/build/tasks/dtimages.mk b/build/tasks/dtimages.mk
index 054ad3d..45954eb 100644
--- a/build/tasks/dtimages.mk
+++ b/build/tasks/dtimages.mk
@@ -7,7 +7,7 @@
ifneq ($(filter yukawa%, $(TARGET_DEVICE)),)
-MKDTIMG := $(realpath prebuilts/misc/$(HOST_PREBUILT_TAG)/libufdt/mkdtimg)
+MKDTIMG := system/libufdt/utils/src/mkdtboimg.py
DTBIMAGE := $(PRODUCT_OUT)/dtb.img
DTBOIMAGE := $(PRODUCT_OUT)/$(DTBO_UNSIGNED)
@@ -21,13 +21,15 @@ DTB_FILES := \
DTBO_FILES := \
$(LOCAL_DTB)/meson-g12a-sei510-android.dtb-$(TARGET_KERNEL_USE) \
$(LOCAL_DTB)/meson-sm1-sei610-android.dtb-$(TARGET_KERNEL_USE) \
- $(LOCAL_DTB)/meson-sm1-khadas-vim3l-android.dtb-$(TARGET_KERNEL_USE)
+ $(LOCAL_DTB)/meson-sm1-khadas-vim3l-android.dtb-$(TARGET_KERNEL_USE)
$(DTBIMAGE): $(DTB_FILES)
cat $^ > $@
-$(DTBOIMAGE): $(DTBO_FILES)
- $(MKDTIMG) create $@ $^
+$(DTBOIMAGE): PRIVATE_MKDTIMG := $(MKDTIMG)
+$(DTBOIMAGE): PRIVATE_DTBO_FILES := $(DTBO_FILES)
+$(DTBOIMAGE): $(DTBO_FILES) $(MKDTIMG)
+ $(PRIVATE_MKDTIMG) create $@ $(PRIVATE_DTBO_FILES)
include $(CLEAR_VARS)
LOCAL_MODULE := dtbimage