summaryrefslogtreecommitdiff
path: root/device-common.mk
diff options
context:
space:
mode:
authorAlistair Strachan <astrachan@google.com>2019-03-27 01:26:21 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-03-27 01:26:21 -0700
commit8da0b0a44f7f9915b4033550cdcefca688887c7a (patch)
tree2f7e03e6d0c7978f741e2631f8a02d7314377043 /device-common.mk
parent184d18d0d6fcc547c94b85acef4b5a86445464ee (diff)
parent5a8f63ffe387d801ae522d2f0e0732014ec2729d (diff)
downloadhikey-8da0b0a44f7f9915b4033550cdcefca688887c7a.tar.gz
Merge "Use different hwcomposer HALs for hikey and hikey960" am: 5ba6c593c0 am: 8638c8a3ec
am: 5a8f63ffe3 Change-Id: I45ad5f9397cce75be60d1efcdf860da285409db5
Diffstat (limited to 'device-common.mk')
-rw-r--r--device-common.mk8
1 files changed, 3 insertions, 5 deletions
diff --git a/device-common.mk b/device-common.mk
index 232a2fa2..938322c4 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\