commit ec36f2d62fe5ce2b76e1ee51d3656455480831ac
author John Stultz <john.stultz@linaro.org> Wed Feb 02 04:37:53 2022 +0000
committer John Stultz <john.stultz@linaro.org> Wed Feb 23 19:18:24 2022 +0000
tree 38440597e50aa6c8db367f9805c935282595be0c
parent 92fd6ed17beaad46ede504577b65f45dd015190a

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

device-common.mk

diff --git a/device-common.mk b/device-common.mk
index 6d04752..ec3d793 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -17,6 +17,28 @@
 # Enable updating of APEXes
 $(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
 
+# Check vendor package version
+# If you need to make changes to the vendor partition,
+# please modify the source git project here:
+#   https://staging-git.codelinaro.org/linaro/linaro-aosp/aosp-linaro-vendor-package
+include $(LOCAL_PATH)/vendor-package-ver.mk
+ifneq (,$(wildcard $(LINARO_VENDOR_PATH)/hikey960/$(EXPECTED_LINARO_VENDOR_VERSION)/version.mk))
+  # Unfortunately inherit-product doesn't export build variables from the
+  # called make file to the caller, so we have to include it directly here.
+  include $(LINARO_VENDOR_PATH)/hikey960/$(EXPECTED_LINARO_VENDOR_VERSION)/version.mk
+  ifneq ($(TARGET_LINARO_VENDOR_VERSION), $(EXPECTED_LINARO_VENDOR_VERSION))
+    $(warning TARGET_LINARO_VENDOR_VERSION ($(TARGET_LINARO_VENDOR_VERSION)) does not match exiting the build ($(EXPECTED_LINARO_VENDOR_VERSION)).)
+    $(warning Please download new binaries here:)
+    $(warning    $(VND_PKG_URL) )
+    $(warning And extract in the ANDROID_TOP_DIR)
+  endif
+else
+  $(warning Missing Linaro Vendor Package!)
+  $(warning Please download new binaries here:)
+  $(warning    $(VND_PKG_URL) )
+  $(warning And extract in the ANDROID_TOP_DIR)
+endif
+$(warning, EXPECTED_LINARO_VENDOR_VERSION=$(EXPECTED_LINARO_VENDOR_VERSION))
 
 ifneq (,$(filter $(TARGET_PRODUCT),hikey960_tv hikey_tv))
 # Setup TV Build