hikey960/hikey: Re-transition to using to vendor-package
Moves the bootloader objects, and mali libraries to the vendor
package and adds the support files, tweaking the flash-all.sh
script
Will use the vendor-package located here:
https://releases.linaro.org/android/aosp-linaro-vendor-package/extract-linaro_devices-20220210.tgz
Previously this patch was reverted, as there would be build
errors when the vendor pacakge was missing.
This patch re-applies the earlier change, with some additional
fixes to ensure we don't see build trouble when the package is
missing.
Signed-off-by: John Stultz <john.stultz@linaro.org>
Change-Id: I53ec5516d91391c0d3f18c801e730eff150076af
diff --git a/build/tasks/dtimage.mk b/build/tasks/dtimage.mk
index 4d6a74d..f102d6c 100644
--- a/build/tasks/dtimage.mk
+++ b/build/tasks/dtimage.mk
@@ -1,7 +1,11 @@
ifneq ($(filter hikey%, $(TARGET_DEVICE)),)
ifneq ($(TARGET_NO_DTIMAGE), true)
+# make sure the vendor package is present
-MKDTIMG := device/linaro/hikey/installer/hikey960/mkdtimg
+include device/linaro/dragonboard/vendor-package-ver.mk
+ifneq (,$(wildcard $(LINARO_VENDOR_PATH)/hikey960/$(EXPECTED_LINARO_VENDOR_VERSION)/version.mk))
+
+MKDTIMG := $(LINARO_VENDOR_PATH)/hikey960/$(EXPECTED_LINARO_VENDOR_VERSION)/bootloader/mkdtimg
DTB := $(PRODUCT_OUT)/hi3660-hikey960.dtb
$(PRODUCT_OUT)/dt.img: $(DTB)
@@ -15,3 +19,4 @@
endif
endif
+endif