diff --git a/modules/Android.mk b/modules/Android.mk
new file mode 100644
index 0000000..a7278bb
--- /dev/null
+++ b/modules/Android.mk
@@ -0,0 +1,2 @@
+hardware_modules := gralloc hwcomposer
+include $(call all-named-subdir-makefiles,$(hardware_modules))
diff --git a/modules/hwcomposer/Android.mk b/modules/hwcomposer/Android.mk
index da2b234..f1e819b 100644
--- a/modules/hwcomposer/Android.mk
+++ b/modules/hwcomposer/Android.mk
@@ -24,4 +24,5 @@
 LOCAL_SRC_FILES := hwcomposer.cpp
 LOCAL_MODULE := hwcomposer.default
 LOCAL_CFLAGS:= -DLOG_TAG=\"hwcomposer\"
+LOCAL_MODULE_TAGS := optional
 include $(BUILD_SHARED_LIBRARY)