From dcffd2b482a625a99233d82019d7b96919c41600 Mon Sep 17 00:00:00 2001 From: William Roberts <william.c.roberts@intel.com> Date: Tue, 29 Sep 2015 13:52:37 -0700 Subject: [PATCH] property_contexts: don't delete intermediate on failure When property_contexts fails to build, the file is deleted leaving only the error message for debugging. Build property_contexts and general variant as a temporary intermediate before running checkfc. Change-Id: Ia86eb0480c9493ceab36fed779b2fe6ab85d2b3d Signed-off-by: William Roberts <william.c.roberts@intel.com> --- Android.mk | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/Android.mk b/Android.mk index 1199d14cf..a303eda32 100644 --- a/Android.mk +++ b/Android.mk @@ -263,17 +263,23 @@ include $(BUILD_SYSTEM)/base_rules.mk all_pc_files := $(call build_policy, property_contexts) +property_contexts.tmp := $(intermediates)/property_contexts.tmp +$(property_contexts.tmp): PRIVATE_PC_FILES := $(all_pc_files) +$(property_contexts.tmp): PRIVATE_ADDITIONAL_M4DEFS := $(LOCAL_ADDITIONAL_M4DEFS) +$(property_contexts.tmp): $(all_pc_files) + @mkdir -p $(dir $@) + $(hide) m4 -s $(PRIVATE_ADDITIONAL_M4DEFS) $(PRIVATE_PC_FILES) > $@ + $(LOCAL_BUILT_MODULE): PRIVATE_SEPOLICY := $(built_sepolicy) -$(LOCAL_BUILT_MODULE): PRIVATE_PC_FILES := $(all_pc_files) -$(LOCAL_BUILT_MODULE): PRIVATE_ADDITIONAL_M4DEFS := $(LOCAL_ADDITIONAL_M4DEFS) -$(LOCAL_BUILT_MODULE): $(all_pc_files) $(built_sepolicy) $(HOST_OUT_EXECUTABLES)/checkfc +$(LOCAL_BUILT_MODULE): $(property_contexts.tmp) $(built_sepolicy) $(HOST_OUT_EXECUTABLES)/checkfc $(ACP) @mkdir -p $(dir $@) - $(hide) m4 -s $(PRIVATE_ADDITIONAL_M4DEFS) $(PRIVATE_PC_FILES) > $@ - $(hide) $(HOST_OUT_EXECUTABLES)/checkfc -p $(PRIVATE_SEPOLICY) $@ + $(hide) $(ACP) $< $@ + $(hide) $(HOST_OUT_EXECUTABLES)/checkfc -p $(PRIVATE_SEPOLICY) $< built_pc := $(LOCAL_BUILT_MODULE) all_pc_files := +property_contexts.tmp := ################################## include $(CLEAR_VARS) @@ -284,12 +290,18 @@ LOCAL_MODULE_TAGS := tests include $(BUILD_SYSTEM)/base_rules.mk -$(LOCAL_BUILT_MODULE): PRIVATE_SEPOLICY := $(built_general_sepolicy) -$(LOCAL_BUILT_MODULE): $(addprefix $(LOCAL_PATH)/, property_contexts) $(built_general_sepolicy) $(HOST_OUT_EXECUTABLES)/checkfc +general_property_contexts.tmp := $(intermediates)/general_property_contexts.tmp +$(general_property_contexts.tmp): $(addprefix $(LOCAL_PATH)/, property_contexts) @mkdir -p $(dir $@) $(hide) m4 -s $< > $@ - $(hide) $(HOST_OUT_EXECUTABLES)/checkfc -p $(PRIVATE_SEPOLICY) $@ +$(LOCAL_BUILT_MODULE): PRIVATE_SEPOLICY := $(built_general_sepolicy) +$(LOCAL_BUILT_MODULE): $(general_property_contexts.tmp) $(built_general_sepolicy) $(HOST_OUT_EXECUTABLES)/checkfc $(ACP) + @mkdir -p $(dir $@) + $(hide) $(ACP) $< $@ + $(hide) $(HOST_OUT_EXECUTABLES)/checkfc -p $(PRIVATE_SEPOLICY) $< + +general_property_contexts.tmp := ################################## include $(CLEAR_VARS) -- GitLab