diff options
| author | Steve Muckle <smuckle@google.com> | 2022-02-16 05:56:08 +0000 |
|---|---|---|
| committer | Steve Muckle <smuckle@google.com> | 2022-02-16 05:58:48 +0000 |
| commit | e5d9bba726b715b58bbce26e36faa00278c0377e (patch) | |
| tree | 2dbcd5b5596907aab0c475f79004293ca442c476 /device-common.mk | |
| parent | 0a9c087775aff4ba10d91db4b77e20e02f477ff2 (diff) | |
| download | hikey-e5d9bba726b715b58bbce26e36faa00278c0377e.tar.gz | |
Revert "hikey960/hikey: Transition to using to vendor-package"
This reverts commit af6e3c040223f3dfa5ac3e8b684b16a37d9a078c.
Reason for revert: broke build_test target, b/219798815
Change-Id: I22cfd1321d22b1f03e7e12a781a94886871faa18
Diffstat (limited to 'device-common.mk')
| -rw-r--r-- | device-common.mk | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/device-common.mk b/device-common.mk index 90695957..6d047521 100644 --- a/device-common.mk +++ b/device-common.mk @@ -17,31 +17,6 @@ # 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 |