diff --git a/Android.mk b/Android.mk
index b49afbdb..e0555941 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,7 +24,12 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
 	libhwcomposer_common \
 	libhwcomposer_wsi
 
+ifeq ($(strip $(TARGET_GFX_INTEL)), intel)
+LOCAL_MODULE := hwcomposer.$(TARGET_GFX_INTEL)
+else
 LOCAL_MODULE := hwcomposer.$(TARGET_BOARD_PLATFORM)
+endif
+
 LOCAL_MODULE_TAGS := optional
 # Preffered paths for all vendor hals /vendor/lib/hw
 LOCAL_PROPRIETARY_MODULE := true