diff options
| -rw-r--r-- | device-common.mk | 4 | ||||
| -rw-r--r-- | gralloc/Android.mk | 2 | ||||
| -rw-r--r-- | gralloc960/Android.hikey960.mk | 6 | ||||
| -rw-r--r-- | hikey-common.mk | 8 | ||||
| -rw-r--r-- | hikey/device-hikey.mk | 4 | ||||
| -rw-r--r-- | hikey960.mk | 12 | ||||
| -rw-r--r-- | hikey960/device-hikey960.mk | 4 |
7 files changed, 4 insertions, 36 deletions
diff --git a/device-common.mk b/device-common.mk index 1eb2e56f..d344fbb0 100644 --- a/device-common.mk +++ b/device-common.mk @@ -97,11 +97,7 @@ PRODUCT_PACKAGES += \ android.hardware.graphics.composer@2.1-service \ android.hardware.graphics.mapper@2.0-impl-2.1 \ -ifeq ($(HIKEY_USE_LEGACY_TI_BLUETOOTH), true) -PRODUCT_PACKAGES += android.hardware.bluetooth@1.0-service.hikey uim -else PRODUCT_PACKAGES += android.hardware.bluetooth@1.1-service.btlinux -endif # # Power HAL diff --git a/gralloc/Android.mk b/gralloc/Android.mk index 20b8f66d..947a184c 100644 --- a/gralloc/Android.mk +++ b/gralloc/Android.mk @@ -54,8 +54,6 @@ LOCAL_SRC_FILES := \ #LOCAL_CFLAGS+= -DMALI_VSYNC_EVENT_REPORT_ENABLE -ifeq ($(HIKEY_USE_DRM_HWCOMPOSER), true) LOCAL_CFLAGS += -DDISABLE_FRAMEBUFFER_HAL -endif include $(BUILD_SHARED_LIBRARY) diff --git a/gralloc960/Android.hikey960.mk b/gralloc960/Android.hikey960.mk index 8b0b1bea..57b4f3e2 100644 --- a/gralloc960/Android.hikey960.mk +++ b/gralloc960/Android.hikey960.mk @@ -52,8 +52,6 @@ GRALLOC_DISP_H=0 # Vsync backend(not used) GRALLOC_VSYNC_BACKEND=default -ifeq ($(HIKEY_USE_DRM_HWCOMPOSER), true) - GRALLOC_USE_ION_DMA_HEAP=1 - GRALLOC_DISABLE_FRAMEBUFFER_HAL=1 -endif +GRALLOC_USE_ION_DMA_HEAP=1 +GRALLOC_DISABLE_FRAMEBUFFER_HAL=1 diff --git a/hikey-common.mk b/hikey-common.mk index 3df9ba70..bf3bd24b 100644 --- a/hikey-common.mk +++ b/hikey-common.mk @@ -2,20 +2,12 @@ ifndef TARGET_KERNEL_USE TARGET_KERNEL_USE=4.19 endif -HIKEY_USE_DRM_HWCOMPOSER := false - LOCAL_KERNEL_HOME ?= device/linaro/hikey-kernel/hikey/$(TARGET_KERNEL_USE) TARGET_PREBUILT_KERNEL := $(LOCAL_KERNEL_HOME)/Image.gz-dtb TARGET_PREBUILT_DTB := $(LOCAL_KERNEL_HOME)/hi6220-hikey.dtb PRODUCT_ENFORCE_VINTF_MANIFEST_OVERRIDE := true -ifeq ($(TARGET_KERNEL_USE), 4.4) - HIKEY_USE_LEGACY_TI_BLUETOOTH := true -else - HIKEY_USE_LEGACY_TI_BLUETOOTH := false - HIKEY_USE_DRM_HWCOMPOSER := true -endif TARGET_FSTAB := fstab.hikey $(call inherit-product, device/linaro/hikey/hikey/device-hikey.mk) diff --git a/hikey/device-hikey.mk b/hikey/device-hikey.mk index cec2e6f0..aa202b37 100644 --- a/hikey/device-hikey.mk +++ b/hikey/device-hikey.mk @@ -51,9 +51,7 @@ PRODUCT_PACKAGES += power.hikey # Sensors HAL PRODUCT_PACKAGES += sensors.hikey -ifeq ($(HIKEY_USE_DRM_HWCOMPOSER), true) - PRODUCT_PACKAGES += hwcomposer.drm_hikey -endif +PRODUCT_PACKAGES += hwcomposer.drm_hikey # Include mali blobs from ARM PRODUCT_PACKAGES += libGLES_mali.so END_USER_LICENCE_AGREEMENT.txt diff --git a/hikey960.mk b/hikey960.mk index 243b0028..b300bfa8 100644 --- a/hikey960.mk +++ b/hikey960.mk @@ -5,18 +5,6 @@ LOCAL_KERNEL_HOME ?= device/linaro/hikey-kernel/hikey960/$(TARGET_KERNEL_USE) TARGET_PREBUILT_KERNEL := $(LOCAL_KERNEL_HOME)/Image.gz-dtb TARGET_PREBUILT_DTB := $(LOCAL_KERNEL_HOME)/hi3660-hikey960.dtb -ifeq ($(TARGET_KERNEL_USE), 4.4) - HIKEY_USE_DRM_HWCOMPOSER := false - HIKEY_USE_LEGACY_TI_BLUETOOTH := true -else - ifeq ($(TARGET_KERNEL_USE), 4.9) - HIKEY_USE_DRM_HWCOMPOSER := false - else - HIKEY_USE_DRM_HWCOMPOSER := true - endif - HIKEY_USE_LEGACY_TI_BLUETOOTH := false -endif - ifndef HIKEY_USES_GKI ifeq ($(TARGET_KERNEL_USE), 5.4) HIKEY_USES_GKI := true diff --git a/hikey960/device-hikey960.mk b/hikey960/device-hikey960.mk index 46ffbe72..d34dc311 100644 --- a/hikey960/device-hikey960.mk +++ b/hikey960/device-hikey960.mk @@ -92,9 +92,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += sys.usb.controller=ff100000.dwc3 PRODUCT_PACKAGES += sensors.hikey960 -ifeq ($(HIKEY_USE_DRM_HWCOMPOSER), true) - PRODUCT_PACKAGES += hwcomposer.drm_hikey960 -endif +PRODUCT_PACKAGES += hwcomposer.drm_hikey960 ifneq ($(TARGET_NO_RECOVERY),true) PRODUCT_COPY_FILES += \ |