From 3746a0ae63a56a6b18fabd3e89bfe4760a1691e3 Mon Sep 17 00:00:00 2001 From: William Roberts <william.c.roberts@intel.com> Date: Fri, 25 Sep 2015 10:18:44 -0700 Subject: [PATCH] file_contexts: don't delete intermediate on failure Currently, if an error is detected in a file_contexts file, the intermediate file_context.tmp file is removed, thus making debugging of build issues problematic. Instead, employ checkfc tool during the compilation recipe so the m4 concatenated intermediate is preserved on failure. Change-Id: Ic827385d3bc3434b6c2a9bba5313cd42b5f15599 Signed-off-by: William Roberts <william.c.roberts@intel.com> --- Android.mk | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Android.mk b/Android.mk index 0b9af0aec..1199d14cf 100644 --- a/Android.mk +++ b/Android.mk @@ -162,16 +162,16 @@ endif all_fc_files := $(call build_policy, $(all_fc_files)) file_contexts.tmp := $(intermediates)/file_contexts.tmp -$(file_contexts.tmp): PRIVATE_SEPOLICY := $(built_sepolicy) $(file_contexts.tmp): PRIVATE_FC_FILES := $(all_fc_files) $(file_contexts.tmp): PRIVATE_ADDITIONAL_M4DEFS := $(LOCAL_ADDITIONAL_M4DEFS) -$(file_contexts.tmp): $(all_fc_files) $(built_sepolicy) $(HOST_OUT_EXECUTABLES)/checkfc +$(file_contexts.tmp): $(all_fc_files) @mkdir -p $(dir $@) $(hide) m4 -s $(PRIVATE_ADDITIONAL_M4DEFS) $(PRIVATE_FC_FILES) > $@ - $(hide) $(HOST_OUT_EXECUTABLES)/checkfc $(PRIVATE_SEPOLICY) $@ -$(LOCAL_BUILT_MODULE): $(file_contexts.tmp) $(HOST_OUT_EXECUTABLES)/sefcontext_compile +$(LOCAL_BUILT_MODULE): PRIVATE_SEPOLICY := $(built_sepolicy) +$(LOCAL_BUILT_MODULE): $(file_contexts.tmp) $(built_sepolicy) $(HOST_OUT_EXECUTABLES)/sefcontext_compile $(HOST_OUT_EXECUTABLES)/checkfc @mkdir -p $(dir $@) + $(hide) $(HOST_OUT_EXECUTABLES)/checkfc $(PRIVATE_SEPOLICY) $< $(hide) $(HOST_OUT_EXECUTABLES)/sefcontext_compile -o $@ $< built_fc := $(LOCAL_BUILT_MODULE) @@ -188,14 +188,14 @@ LOCAL_MODULE_TAGS := tests include $(BUILD_SYSTEM)/base_rules.mk general_file_contexts.tmp := $(intermediates)/general_file_contexts.tmp -$(general_file_contexts.tmp): PRIVATE_SEPOLICY := $(built_general_sepolicy) -$(general_file_contexts.tmp): $(addprefix $(LOCAL_PATH)/, file_contexts) $(built_general_sepolicy) $(HOST_OUT_EXECUTABLES)/checkfc +$(general_file_contexts.tmp): $(addprefix $(LOCAL_PATH)/, file_contexts) @mkdir -p $(dir $@) $(hide) m4 -s $< > $@ - $(hide) $(HOST_OUT_EXECUTABLES)/checkfc $(PRIVATE_SEPOLICY) $@ -$(LOCAL_BUILT_MODULE): $(general_file_contexts.tmp) $(HOST_OUT_EXECUTABLES)/sefcontext_compile +$(LOCAL_BUILT_MODULE): PRIVATE_SEPOLICY := $(built_general_sepolicy) +$(LOCAL_BUILT_MODULE): $(general_file_contexts.tmp) $(built_general_sepolicy) $(HOST_OUT_EXECUTABLES)/sefcontext_compile $(HOST_OUT_EXECUTABLES)/checkfc @mkdir -p $(dir $@) + $(hide) $(HOST_OUT_EXECUTABLES)/checkfc $(PRIVATE_SEPOLICY) $< $(hide) $(HOST_OUT_EXECUTABLES)/sefcontext_compile -o $@ $< general_file_contexts.tmp := -- GitLab