diff --git a/device.mk b/device.mk
index 8e61bc1..eb1a9c0 100644
--- a/device.mk
+++ b/device.mk
@@ -72,7 +72,6 @@
 	android.hardware.boot@1.0-service \
 	libdrm \
 	libdrm_omap \
-	hwcomposer.am57x \
 	gralloc.am57x \
 	libEGL_POWERVR_SGX544_116 \
 	libGLESv1_CM_POWERVR_SGX544_116 \
@@ -81,6 +80,14 @@
 	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",
+    ],
+}