diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-02-16 07:11:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-02-16 07:11:47 +0000 |
| commit | 92fd6ed17beaad46ede504577b65f45dd015190a (patch) | |
| tree | f0abcbb9970bde49ee3b2c7531b022fac4315cfa /hikey960.mk | |
| parent | cc6feb3510ad89a5ee7337d4c48fcba254ed9ee0 (diff) | |
| parent | e5d9bba726b715b58bbce26e36faa00278c0377e (diff) | |
| download | hikey-92fd6ed17beaad46ede504577b65f45dd015190a.tar.gz | |
Merge changes I22cfd132,If6784590
* changes:
Revert "hikey960/hikey: Transition to using to vendor-package"
Revert "hikey960: Remove hifi dsp support."
Diffstat (limited to 'hikey960.mk')
| -rw-r--r-- | hikey960.mk | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/hikey960.mk b/hikey960.mk index 06ac84b5..b300bfa8 100644 --- a/hikey960.mk +++ b/hikey960.mk @@ -11,14 +11,11 @@ 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 @@ -49,6 +46,3 @@ ifneq ($(HIKEY_USES_GKI),) $(SDCARDFS_KO) endif endif - -PRODUCT_SOONG_NAMESPACES += \ - vendor/linaro/hikey960/$(EXPECTED_LINARO_VENDOR_VERSION)/mali/bifrost |