diff options
| author | Colin Cross <ccross@android.com> | 2019-03-22 13:16:17 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-03-23 21:55:40 -0700 |
| commit | d62603477c41be20d713940b5ec5e62a28f6295f (patch) | |
| tree | a4c853fa026a097b1b17a71dbb7d57f92337480a /device-common.mk | |
| parent | 78c597e27981e43657f123a3b6d7a46ce4e91e6f (diff) | |
| download | hikey-d62603477c41be20d713940b5ec5e62a28f6295f.tar.gz | |
Use different hwcomposer HALs for hikey and hikey960
Instead of conditionally compiling hwcomposer.drm for hikey and
hikey960, compile two different modules and selectively use them
on hikey and hikey960.
Bug: 122332597
Test: none
Change-Id: Ifcb64798bc34101d9e1f851454c3fe361c478c12
Diffstat (limited to 'device-common.mk')
| -rw-r--r-- | device-common.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/device-common.mk b/device-common.mk index dcf03777..525ae8d9 100644 --- a/device-common.mk +++ b/device-common.mk @@ -93,11 +93,6 @@ PRODUCT_PACKAGES += \ android.hardware.graphics.composer@2.1-service \ android.hardware.graphics.mapper@2.0-impl -ifeq ($(HIKEY_USE_DRM_HWCOMPOSER), true) - BOARD_USES_DRM_HWCOMPOSER := true - PRODUCT_PACKAGES += hwcomposer.drm -endif - # Memtrack PRODUCT_PACKAGES += memtrack.default \ android.hardware.memtrack@1.0-service \ @@ -240,6 +235,9 @@ PRODUCT_COPY_FILES += \ device/linaro/hikey/etc/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml +PRODUCT_COPY_FILES += \ + device/linaro/hikey/init.common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.common.rc \ + PRODUCT_PACKAGES += \ android.hardware.renderscript@1.0.vndk-sp\ android.hardware.graphics.composer@2.1.vndk-sp\ |