diff options
| author | John Stultz <john.stultz@linaro.org> | 2018-07-11 12:19:51 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-07-11 12:19:51 -0700 |
| commit | 72e15a43c38f435dad4e73b627c2b0b490fecc97 (patch) | |
| tree | e77cf408b726ea303b8d58c73acfb09984d391bc | |
| parent | 10f0bc13db93ea4f8a7c5657ff12320ae519832e (diff) | |
| parent | 7c2f3413d06bb04e0481cab22f946b7e1d375e5d (diff) | |
| download | hikey-72e15a43c38f435dad4e73b627c2b0b490fecc97.tar.gz | |
Merge "hikey960: Add version check on the hisi vdec package"
am: 7c2f3413d0
Change-Id: I2f497300455b6f2ce55ef6f8a8124eb06437f26a
| -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 |