From efd6d6e0dab97a49706f1116dde2ec87257f79c1 Mon Sep 17 00:00:00 2001
From: Stephen Smalley <sds@tycho.nsa.gov>
Date: Fri, 18 May 2012 08:24:25 -0400
Subject: [PATCH] Apply m4 to file_contexts and property_contexts to support
 includes.

---
 Android.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Android.mk b/Android.mk
index ee1a93132..68f4c69a2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -53,7 +53,7 @@ include $(BUILD_SYSTEM)/base_rules.mk
 file_contexts := $(intermediates)/file_contexts
 $(file_contexts): $(LOCAL_PATH)/file_contexts $(LOCAL_POLICY_FC)
 	@mkdir -p $(dir $@)
-	$(hide) cat $^ > $@
+	$(hide) m4 -s $^ > $@
 
 file_contexts :=
 ##################################
@@ -80,7 +80,7 @@ include $(BUILD_SYSTEM)/base_rules.mk
 property_contexts := $(intermediates)/property_contexts
 $(property_contexts): $(LOCAL_PATH)/property_contexts $(LOCAL_POLICY_PC)
 	@mkdir -p $(dir $@)
-	$(hide) cat $^ > $@
+	$(hide) m4 -s $^ > $@
 
 property_contexts :=
 ##################################
-- 
GitLab