From cb1ab9858e4f44ee87c4a86f1cc9e858b8b36475 Mon Sep 17 00:00:00 2001 From: William Roberts <william.c.roberts@intel.com> Date: Mon, 14 Dec 2015 07:54:28 -0800 Subject: [PATCH] sectxfile_nl: fix superfluous dependencies The target sectxfile_nl, which is an auto-generated newline file, has dependencies on itself and the other files. The dependencies should be on the other files and this newline file, not the other way around. Ideally, the *_contexts recipes should have the dependency recorded for their "contexts" files and the newline file. Additionally, recipe dependencies for building the *_contexts files depended on the list of all the contexts files with the newline file in that list, however an additional explicit addition of the newline file was also added in. Remove this, since its in the full list of files. Change-Id: Iac658923f23a8d9263d392c44003b6bda4064646 Signed-off-by: William Roberts <william.c.roberts@intel.com> --- Android.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Android.mk b/Android.mk index 9b39a5993..5516d2173 100644 --- a/Android.mk +++ b/Android.mk @@ -65,7 +65,7 @@ LOCAL_MODULE_TAGS := optional # Create a file containing newline only to add between context config files include $(BUILD_SYSTEM)/base_rules.mk -$(LOCAL_BUILT_MODULE): $(all_fcfiles_with_nl) $(all_pcfiles_with_nl) $(all_svcfiles_with_nl) +$(LOCAL_BUILT_MODULE): @mkdir -p $(dir $@) $(hide) echo > $@ @@ -188,7 +188,7 @@ all_fcfiles_with_nl := $(call add_nl, $(all_fc_files), $(built_nl)) file_contexts.tmp := $(intermediates)/file_contexts.tmp $(file_contexts.tmp): PRIVATE_FC_FILES := $(all_fcfiles_with_nl) $(file_contexts.tmp): PRIVATE_ADDITIONAL_M4DEFS := $(LOCAL_ADDITIONAL_M4DEFS) -$(file_contexts.tmp): $(all_fc_files) $(all_fcfiles_with_nl) $(built_nl) +$(file_contexts.tmp): $(all_fc_files) $(all_fcfiles_with_nl) @mkdir -p $(dir $@) $(hide) m4 -s $(PRIVATE_ADDITIONAL_M4DEFS) $(PRIVATE_FC_FILES) > $@ @@ -291,7 +291,7 @@ all_pcfiles_with_nl := $(call add_nl, $(all_pc_files), $(built_nl)) property_contexts.tmp := $(intermediates)/property_contexts.tmp $(property_contexts.tmp): PRIVATE_PC_FILES := $(all_pcfiles_with_nl) $(property_contexts.tmp): PRIVATE_ADDITIONAL_M4DEFS := $(LOCAL_ADDITIONAL_M4DEFS) -$(property_contexts.tmp): $(all_pc_files) $(all_pcfiles_with_nl) $(built_nl) +$(property_contexts.tmp): $(all_pc_files) $(all_pcfiles_with_nl) @mkdir -p $(dir $@) $(hide) m4 -s $(PRIVATE_ADDITIONAL_M4DEFS) $(PRIVATE_PC_FILES) > $@ @@ -344,7 +344,7 @@ all_svcfiles_with_nl := $(call add_nl, $(all_svc_files), $(built_nl)) service_contexts.tmp := $(intermediates)/service_contexts.tmp $(service_contexts.tmp): PRIVATE_SVC_FILES := $(all_svcfiles_with_nl) $(service_contexts.tmp): PRIVATE_ADDITIONAL_M4DEFS := $(LOCAL_ADDITIONAL_M4DEFS) -$(service_contexts.tmp): $(all_svc_files) $(all_svcfiles_with_nl) $(built_nl) +$(service_contexts.tmp): $(all_svc_files) $(all_svcfiles_with_nl) @mkdir -p $(dir $@) $(hide) m4 -s $(PRIVATE_ADDITIONAL_M4DEFS) $(PRIVATE_SVC_FILES) > $@ -- GitLab