diff options
| author | Steve Muckle <smuckle@google.com> | 2022-02-15 19:46:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-15 19:46:19 +0000 |
| commit | 0fcba0a77010906706c9b78e8b6733dc5dbe0f63 (patch) | |
| tree | 32897bd3ccb387bede5e74b9f3c05fb330f1f9af /hikey960.mk | |
| parent | 0eb5fe001cdfff4d2ce299638f59196a9183a67c (diff) | |
| parent | 039751785a800387f166b9fe6ecf3ac30e0f66c8 (diff) | |
| download | hikey-0fcba0a77010906706c9b78e8b6733dc5dbe0f63.tar.gz | |
Merge "hikey960/hikey: Transition to using to vendor-package" am: b92752cc17 am: c3c21217df am: 039751785a
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1967825
Change-Id: I9c46715f610962c4b9bc3892a3ade41b014b1950
Diffstat (limited to 'hikey960.mk')
| -rw-r--r-- | hikey960.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/hikey960.mk b/hikey960.mk index b300bfa8..06ac84b5 100644 --- a/hikey960.mk +++ b/hikey960.mk @@ -11,11 +11,14 @@ ifndef HIKEY_USES_GKI endif endif -# + +include $(LOCAL_PATH)/vendor-package-ver.mk + # Inherit the common device configuration $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, device/linaro/hikey/hikey960/device-hikey960.mk) $(call inherit-product, device/linaro/hikey/device-common.mk) +$(call inherit-product, vendor/linaro/hikey960/$(EXPECTED_LINARO_VENDOR_VERSION)/hikey960.mk) PRODUCT_PROPERTY_OVERRIDES += ro.opengles.version=196608 @@ -46,3 +49,6 @@ ifneq ($(HIKEY_USES_GKI),) $(SDCARDFS_KO) endif endif + +PRODUCT_SOONG_NAMESPACES += \ + vendor/linaro/hikey960/$(EXPECTED_LINARO_VENDOR_VERSION)/mali/bifrost |