diff options
| author | Alistair Strachan <astrachan@google.com> | 2019-03-27 01:26:21 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-27 01:26:21 -0700 |
| commit | 8da0b0a44f7f9915b4033550cdcefca688887c7a (patch) | |
| tree | 2f7e03e6d0c7978f741e2631f8a02d7314377043 | |
| parent | 184d18d0d6fcc547c94b85acef4b5a86445464ee (diff) | |
| parent | 5a8f63ffe387d801ae522d2f0e0732014ec2729d (diff) | |
| download | hikey-8da0b0a44f7f9915b4033550cdcefca688887c7a.tar.gz | |
Merge "Use different hwcomposer HALs for hikey and hikey960" am: 5ba6c593c0 am: 8638c8a3ec
am: 5a8f63ffe3
Change-Id: I45ad5f9397cce75be60d1efcdf860da285409db5
| -rw-r--r-- | device-common.mk | 8 | ||||
| -rw-r--r-- | hikey/device-hikey.mk | 6 | ||||
| -rw-r--r-- | hikey/init.hikey.rc | 6 | ||||
| -rw-r--r-- | hikey960/device-hikey960.mk | 6 | ||||
| -rw-r--r-- | hikey960/init.hikey960.rc | 6 | ||||
| -rw-r--r-- | init.common.rc | 3 |
6 files changed, 25 insertions, 10 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\ diff --git a/hikey/device-hikey.mk b/hikey/device-hikey.mk index 99fdb508..70680e55 100644 --- a/hikey/device-hikey.mk +++ b/hikey/device-hikey.mk @@ -18,7 +18,7 @@ PRODUCT_COPY_FILES += $(TARGET_PREBUILT_KERNEL):kernel \ $(TARGET_PREBUILT_DTB):hi6220-hikey.dtb \ $(LOCAL_PATH)/$(TARGET_FSTAB):$(TARGET_COPY_OUT_VENDOR)/etc/fstab.hikey \ device/linaro/hikey/fstab.ramdisk:$(TARGET_COPY_OUT_RAMDISK)/fstab.hikey \ - device/linaro/hikey/init.common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey.rc \ + device/linaro/hikey/hikey/init.hikey.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey.rc \ device/linaro/hikey/init.hikey.power.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey.power.rc \ device/linaro/hikey/init.common.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey.usb.rc \ device/linaro/hikey/ueventd.common.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \ @@ -51,6 +51,10 @@ PRODUCT_PACKAGES += power.hikey # Sensors HAL PRODUCT_PACKAGES += sensors.hikey +ifeq ($(HIKEY_USE_DRM_HWCOMPOSER), true) + PRODUCT_PACKAGES += hwcomposer.drm_hikey +endif + # Include mali blobs from ARM PRODUCT_PACKAGES += libGLES_mali.so END_USER_LICENCE_AGREEMENT.txt diff --git a/hikey/init.hikey.rc b/hikey/init.hikey.rc new file mode 100644 index 00000000..8046f91f --- /dev/null +++ b/hikey/init.hikey.rc @@ -0,0 +1,6 @@ +import init.common.rc + +on post-fs + # Set supported opengles version + setprop ro.hardware.hwcomposer drm_hikey + diff --git a/hikey960/device-hikey960.mk b/hikey960/device-hikey960.mk index c1d697a1..2695698e 100644 --- a/hikey960/device-hikey960.mk +++ b/hikey960/device-hikey960.mk @@ -19,7 +19,7 @@ PRODUCT_COPY_FILES += $(TARGET_PREBUILT_KERNEL):kernel \ PRODUCT_COPY_FILES += $(LOCAL_PATH)/fstab.hikey960:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.hikey960 \ device/linaro/hikey/fstab.ramdisk:$(TARGET_COPY_OUT_RAMDISK)/fstab.hikey960 \ - device/linaro/hikey/init.common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey960.rc \ + device/linaro/hikey/hikey960/init.hikey960.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey960.rc \ device/linaro/hikey/init.hikey960.power.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey960.power.rc \ device/linaro/hikey/init.common.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey960.usb.rc \ device/linaro/hikey/ueventd.common.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \ @@ -73,6 +73,10 @@ 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 + # Unfortunately inherit-product doesn't export build variables from the # called make file to the caller, so we have to include it directly here. # FIXME: Improve this the next time we update the binary package diff --git a/hikey960/init.hikey960.rc b/hikey960/init.hikey960.rc new file mode 100644 index 00000000..b7671340 --- /dev/null +++ b/hikey960/init.hikey960.rc @@ -0,0 +1,6 @@ +import init.common.rc + +on post-fs + # Set supported opengles version + setprop ro.hardware.hwcomposer drm_hikey960 + diff --git a/init.common.rc b/init.common.rc index 5950f615..d802936d 100644 --- a/init.common.rc +++ b/init.common.rc @@ -53,9 +53,6 @@ on post-fs setprop status.battery.level_raw 50 setprop status.battery.level_scale 9 -# Set supported opengles version - setprop ro.hardware.hwcomposer drm - # If an app forces screen rotation, revert it once the apps closes setprop persist.demo.rotationlock 1 |