From 616e596385d01bc2de0c4717ba53cb1c9601539d Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Wed, 18 Apr 2012 17:35:55 -0700
Subject: [PATCH] Write out export_includes whenever the module is built.

Bug: 6362268
Change-Id: If872cf8fe597a02e6ca740a181cea85f486df98e
---
 core/binary.mk   | 3 +++
 core/prebuilt.mk | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/core/binary.mk b/core/binary.mk
index 5cb17bcd42..70af9b9da4 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -702,3 +702,6 @@ ifdef LOCAL_EXPORT_C_INCLUDE_DIRS
 else
 	$(hide) touch $@
 endif
+
+# Make sure export_includes gets generated when you are running mm/mmm
+$(LOCAL_BUILT_MODULE) : | $(export_includes)
diff --git a/core/prebuilt.mk b/core/prebuilt.mk
index 0c46341180..b06bb6e0e8 100644
--- a/core/prebuilt.mk
+++ b/core/prebuilt.mk
@@ -56,6 +56,8 @@ ifdef prebuilt_module_is_a_library
 $(intermediates)/export_includes:
 	$(hide) mkdir -p $(dir $@) && rm -f $@
 	$(hide) touch $@
+
+$(LOCAL_BUILT_MODULE) : | $(intermediates)/export_includes
 endif
 endif