diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-18 20:13:18 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-18 20:13:18 +0000 |
| commit | 9a7eaefca0d71ca8883ec5bd35102143b08a6084 (patch) | |
| tree | 8a4605a0efaeaca994bfcf1b860754b5b9398d13 | |
| parent | bb432889c9b901cab56e21f49ec30eb9e18a706c (diff) | |
| parent | 974122d8e54f9023ffc9b75bd7129d9b89850803 (diff) | |
| download | beagle-x15-9a7eaefca0d71ca8883ec5bd35102143b08a6084.tar.gz | |
Merge "Add drm hwc support" am: 8efb9f1a54 am: 09611d95af am: 974122d8e5
Change-Id: I957d41e17cf40a17dc7c1e4f70218831c82a61f3
| -rw-r--r-- | device.mk | 9 | ||||
| -rw-r--r-- | gralloc/Android.bp | 10 |
2 files changed, 18 insertions, 1 deletions
@@ -74,7 +74,6 @@ PRODUCT_PACKAGES += \ android.hardware.fastboot@1.0-impl-mock \ libdrm \ libdrm_omap \ - hwcomposer.am57x \ gralloc.am57x \ libEGL_POWERVR_SGX544_116 \ libGLESv1_CM_POWERVR_SGX544_116 \ @@ -83,6 +82,14 @@ PRODUCT_PACKAGES += \ memtrack.am57x \ pvrsrvctl \ +ifeq ($(USE_DRM_HWC), y) +PRODUCT_PACKAGES += hwcomposer.drm_imagination +PRODUCT_PROPERTY_OVERRIDES += \ + ro.hardware.hwcomposer=drm_imagination \ +else +PRODUCT_PACKAGES += hwcomposer.am57x +endif + #Health PRODUCT_PACKAGES += \ android.hardware.health@2.1-impl \ diff --git a/gralloc/Android.bp b/gralloc/Android.bp new file mode 100644 index 0000000..30c0402 --- /dev/null +++ b/gralloc/Android.bp @@ -0,0 +1,10 @@ +cc_library_shared { + name: "hwcomposer.drm_imagination", + defaults: ["hwcomposer.drm_defaults"], + srcs: [":drm_hwcomposer_platformimagination"], + whole_static_libs: ["drm_hwcomposer"], + shared_libs: ["libion"], + include_dirs: [ + "hardware/ti/am57x/libhwcomposer", + ], +} |