diff options
author | William Roberts | 2015-09-29 15:52:37 -0500 |
---|---|---|
committer | Jeff Vander Stoep | 2015-10-01 16:56:19 -0500 |
commit | dcffd2b482a625a99233d82019d7b96919c41600 (patch) | |
tree | 52cf3c3f775ffc66ab859a5c0399e1db6df929aa /Android.mk | |
parent | 9eb6c87439da2b00699f644a8b8c335bf8cd9680 (diff) | |
download | system-sepolicy-dcffd2b482a625a99233d82019d7b96919c41600.tar.gz system-sepolicy-dcffd2b482a625a99233d82019d7b96919c41600.tar.xz system-sepolicy-dcffd2b482a625a99233d82019d7b96919c41600.zip |
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>
Diffstat (limited to 'Android.mk')
-rw-r--r-- | Android.mk | 28 |
1 files changed, 20 insertions, 8 deletions
@@ -263,17 +263,23 @@ include $(BUILD_SYSTEM)/base_rules.mk | |||
263 | 263 | ||
264 | all_pc_files := $(call build_policy, property_contexts) | 264 | all_pc_files := $(call build_policy, property_contexts) |
265 | 265 | ||
266 | property_contexts.tmp := $(intermediates)/property_contexts.tmp | ||
267 | $(property_contexts.tmp): PRIVATE_PC_FILES := $(all_pc_files) | ||
268 | $(property_contexts.tmp): PRIVATE_ADDITIONAL_M4DEFS := $(LOCAL_ADDITIONAL_M4DEFS) | ||
269 | $(property_contexts.tmp): $(all_pc_files) | ||
270 | @mkdir -p $(dir $@) | ||
271 | $(hide) m4 -s $(PRIVATE_ADDITIONAL_M4DEFS) $(PRIVATE_PC_FILES) > $@ | ||
272 | |||
266 | 273 | ||
267 | $(LOCAL_BUILT_MODULE): PRIVATE_SEPOLICY := $(built_sepolicy) | 274 | $(LOCAL_BUILT_MODULE): PRIVATE_SEPOLICY := $(built_sepolicy) |
268 | $(LOCAL_BUILT_MODULE): PRIVATE_PC_FILES := $(all_pc_files) | 275 | $(LOCAL_BUILT_MODULE): $(property_contexts.tmp) $(built_sepolicy) $(HOST_OUT_EXECUTABLES)/checkfc $(ACP) |
269 | $(LOCAL_BUILT_MODULE): PRIVATE_ADDITIONAL_M4DEFS := $(LOCAL_ADDITIONAL_M4DEFS) | ||
270 | $(LOCAL_BUILT_MODULE): $(all_pc_files) $(built_sepolicy) $(HOST_OUT_EXECUTABLES)/checkfc | ||
271 | @mkdir -p $(dir $@) | 276 | @mkdir -p $(dir $@) |
272 | $(hide) m4 -s $(PRIVATE_ADDITIONAL_M4DEFS) $(PRIVATE_PC_FILES) > $@ | 277 | $(hide) $(ACP) $< $@ |
273 | $(hide) $(HOST_OUT_EXECUTABLES)/checkfc -p $(PRIVATE_SEPOLICY) $@ | 278 | $(hide) $(HOST_OUT_EXECUTABLES)/checkfc -p $(PRIVATE_SEPOLICY) $< |
274 | 279 | ||
275 | built_pc := $(LOCAL_BUILT_MODULE) | 280 | built_pc := $(LOCAL_BUILT_MODULE) |
276 | all_pc_files := | 281 | all_pc_files := |
282 | property_contexts.tmp := | ||
277 | 283 | ||
278 | ################################## | 284 | ################################## |
279 | include $(CLEAR_VARS) | 285 | include $(CLEAR_VARS) |
@@ -284,12 +290,18 @@ LOCAL_MODULE_TAGS := tests | |||
284 | 290 | ||
285 | include $(BUILD_SYSTEM)/base_rules.mk | 291 | include $(BUILD_SYSTEM)/base_rules.mk |
286 | 292 | ||
287 | $(LOCAL_BUILT_MODULE): PRIVATE_SEPOLICY := $(built_general_sepolicy) | 293 | general_property_contexts.tmp := $(intermediates)/general_property_contexts.tmp |
288 | $(LOCAL_BUILT_MODULE): $(addprefix $(LOCAL_PATH)/, property_contexts) $(built_general_sepolicy) $(HOST_OUT_EXECUTABLES)/checkfc | 294 | $(general_property_contexts.tmp): $(addprefix $(LOCAL_PATH)/, property_contexts) |
289 | @mkdir -p $(dir $@) | 295 | @mkdir -p $(dir $@) |
290 | $(hide) m4 -s $< > $@ | 296 | $(hide) m4 -s $< > $@ |
291 | $(hide) $(HOST_OUT_EXECUTABLES)/checkfc -p $(PRIVATE_SEPOLICY) $@ | ||
292 | 297 | ||
298 | $(LOCAL_BUILT_MODULE): PRIVATE_SEPOLICY := $(built_general_sepolicy) | ||
299 | $(LOCAL_BUILT_MODULE): $(general_property_contexts.tmp) $(built_general_sepolicy) $(HOST_OUT_EXECUTABLES)/checkfc $(ACP) | ||
300 | @mkdir -p $(dir $@) | ||
301 | $(hide) $(ACP) $< $@ | ||
302 | $(hide) $(HOST_OUT_EXECUTABLES)/checkfc -p $(PRIVATE_SEPOLICY) $< | ||
303 | |||
304 | general_property_contexts.tmp := | ||
293 | 305 | ||
294 | ################################## | 306 | ################################## |
295 | include $(CLEAR_VARS) | 307 | include $(CLEAR_VARS) |