Merge commit 'f0217cdbde4334bfe2fad7fa484cfa000241ea08' into HEAD
diff --git a/Android.mk b/Android.mk
index 677118f..3e3c295 100644
--- a/Android.mk
+++ b/Android.mk
@@ -36,4 +36,17 @@
 
 include $(BUILD_SHARED_LIBRARY)
 
+###
+# libgatekeeper_static is an empty static library that exports
+# all of the files in gatekeeper as includes.
+###
+include $(CLEAR_VARS)
+LOCAL_MODULE := libgatekeeper_static
+LOCAL_EXPORT_C_INCLUDE_DIRS := \
+        $(LOCAL_PATH) \
+        $(LOCAL_PATH)/include
+LOCAL_MODULE_TAGS := optional
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+include $(BUILD_STATIC_LIBRARY)
+
 include $(call first-makefiles-under,$(LOCAL_PATH))