diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-07-11 19:05:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-07-11 19:05:29 +0000 |
| commit | 7c2f3413d06bb04e0481cab22f946b7e1d375e5d (patch) | |
| tree | 33b503ee979284d9d479c149415d327d0562a0db | |
| parent | 1e2c80bd71e1944c8e992684e4ac38ea45db68c5 (diff) | |
| parent | 221be176e245ec9deb22d6cba799777b4e9c8e3e (diff) | |
| download | hikey-7c2f3413d06bb04e0481cab22f946b7e1d375e5d.tar.gz | |
Merge "hikey960: Add version check on the hisi vdec package"android-p-preview-5
| -rw-r--r-- | hikey960/device-hikey960.mk | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/hikey960/device-hikey960.mk b/hikey960/device-hikey960.mk index d59b3f3d..f96d77af 100644 --- a/hikey960/device-hikey960.mk +++ b/hikey960/device-hikey960.mk @@ -54,4 +54,18 @@ PRODUCT_PACKAGES += power.hikey960 PRODUCT_PACKAGES += sensors.hikey960 -$(call inherit-product-if-exists, vendor/linaro/hikey960/device-vendor.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. +# FIXME: Improve this the next time we update the binary package +ifneq (,$(wildcard vendor/linaro/hikey960/hisilicon/device-partial.mk)) +include vendor/linaro/hikey960/hisilicon/device-partial.mk +endif + +EXPECTED_HISI_CODEC_VERSION := 1 +# Check and make sure the vendor package is the expected version +ifneq ($(TARGET_HISI_CODEC_VERSION),$(EXPECTED_HISI_CODEC_VERSION)) +$(warning TARGET_HISI_CODEC_VERSION ($(TARGET_HISI_CODEC_VERSION)) does not match exiting the build ($(EXPECTED_HISI_CODEC_VERSION)).) +$(warning Please download new binaries here:) +$(warning https://dl.google.com/dl/android/aosp/hisilicon-hikey960-OPR-3c243263.tgz ) +$(warning And extract in the ANDROID_TOP_DIR) +endif |