From af6e3c040223f3dfa5ac3e8b684b16a37d9a078c Mon Sep 17 00:00:00 2001
From: John Stultz <john.stultz@linaro.org>
Date: Wed, 2 Feb 2022 04:37:53 +0000
Subject: hikey960/hikey: 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

Signed-off-by: John Stultz <john.stultz@linaro.org>
Change-Id: I5e22c28c6f2c9ce3a7ec42e72411192dfbb6b312
---
 device-common.mk | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'device-common.mk')

diff --git a/device-common.mk b/device-common.mk
index 6d047521..90695957 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -17,6 +17,31 @@
 # 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)
+    # Would be good to error out here, but that causes other issues
+  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)
+  # Would be good to error out here, but that causes other issues
+endif
+
+$(warning, EXPECTED_LINARO_VENDOR_VERSION=$(EXPECTED_LINARO_VENDOR_VERSION))
 
 ifneq (,$(filter $(TARGET_PRODUCT),hikey960_tv hikey_tv))
 # Setup TV Build
-- 
cgit v1.2.3