commit ffc86bea0e38147a9330177708aedbccd603627a
author William Roberts <william.c.roberts@intel.com> Mon Jun 29 11:16:18 2015 -0700
committer William C Roberts <william.c.roberts@intel.com> Fri Jul 10 19:55:35 2015 +0000
tree 268f270f8e211c63d0e38fcdfde2f48cb55d6bdf
parent 75268b04034848589abb352483d99255bf9a6bd1

Correct local variables for file_contexts_asan

Lowercase local variables and clear them to be
consistent with other recipes and prevent polluting
Make's global name space with set variables.

Change-Id: If455cd4f33d5babbea985867a711e8a10c21a00f
Signed-off-by: William Roberts <william.c.roberts@intel.com>

Android.mk

diff --git a/Android.mk b/Android.mk
index e2e8ca5..1e23d52 100644
--- a/Android.mk
+++ b/Android.mk
@@ -147,19 +147,21 @@
 
 include $(BUILD_SYSTEM)/base_rules.mk
 
-FILE_CONTEXTS := file_contexts
+all_fc_files := file_contexts
 ifeq (address,$(strip $(SANITIZE_TARGET)))
-  FILE_CONTEXTS := $(FILE_CONTEXTS) file_contexts_asan
+  all_fc_files := $(all_fc_files) file_contexts_asan
 endif
-ALL_FC_FILES := $(call build_policy, $(FILE_CONTEXTS))
+all_fc_files := $(call build_policy, $(all_fc_files))
 
 $(LOCAL_BUILT_MODULE): PRIVATE_SEPOLICY := $(built_sepolicy)
-$(LOCAL_BUILT_MODULE):  $(ALL_FC_FILES) $(built_sepolicy) $(HOST_OUT_EXECUTABLES)/checkfc
+$(LOCAL_BUILT_MODULE): PRIVATE_FC_FILES := $(all_fc_files)
+$(LOCAL_BUILT_MODULE): $(all_fc_files) $(built_sepolicy) $(HOST_OUT_EXECUTABLES)/checkfc
 	@mkdir -p $(dir $@)
-	$(hide) m4 -s $(ALL_FC_FILES) > $@
+	$(hide) m4 -s $(PRIVATE_FC_FILES) > $@
 	$(hide) $(HOST_OUT_EXECUTABLES)/checkfc $(PRIVATE_SEPOLICY) $@
 
 built_fc := $(LOCAL_BUILT_MODULE)
+all_fc_files :=
 
 ##################################
 include $(CLEAR_VARS)