Skip to content
Snippets Groups Projects
Commit e5e5e041 authored by Tom Cherry's avatar Tom Cherry Committed by android-build-merger
Browse files

Merge "Use property_info_checker instead of checkfc and fc_sort for properties" 

am: 06058636

Change-Id: I0b9c704a863a9378937c1f06d844dec12ee31cba
parents 10d3c77f 06058636
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 6 additions and 10 deletions
Android.mk
+ 6
− 10
View file @ e5e5e041
...@@ -889,12 +889,10 @@ $(plat_property_contexts.tmp): PRIVATE_ADDITIONAL_M4DEFS := $(LOCAL_ADDITIONAL_M ...@@ -889,12 +889,10 @@ $(plat_property_contexts.tmp): PRIVATE_ADDITIONAL_M4DEFS := $(LOCAL_ADDITIONAL_M
$(plat_property_contexts.tmp): $(plat_pcfiles) $(plat_property_contexts.tmp): $(plat_pcfiles)
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(hide) m4 -s $(PRIVATE_ADDITIONAL_M4DEFS) $(PRIVATE_PC_FILES) > $@ $(hide) m4 -s $(PRIVATE_ADDITIONAL_M4DEFS) $(PRIVATE_PC_FILES) > $@
$(LOCAL_BUILT_MODULE): PRIVATE_SEPOLICY := $(built_sepolicy) $(LOCAL_BUILT_MODULE): $(plat_property_contexts.tmp) $(HOST_OUT_EXECUTABLES)/property_info_checker
$(LOCAL_BUILT_MODULE): PRIVATE_FC_SORT := $(HOST_OUT_EXECUTABLES)/fc_sort
$(LOCAL_BUILT_MODULE): $(plat_property_contexts.tmp) $(built_sepolicy) $(HOST_OUT_EXECUTABLES)/checkfc $(HOST_OUT_EXECUTABLES)/fc_sort
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(hide) $(PRIVATE_FC_SORT) $< $@ $(hide) cp -f $< $@
$(hide) $(HOST_OUT_EXECUTABLES)/checkfc -p $(PRIVATE_SEPOLICY) $@ $(hide) $(HOST_OUT_EXECUTABLES)/property_info_checker $@
built_plat_pc := $(LOCAL_BUILT_MODULE) built_plat_pc := $(LOCAL_BUILT_MODULE)
plat_pcfiles := plat_pcfiles :=
...@@ -924,12 +922,10 @@ $(nonplat_property_contexts.tmp): $(nonplat_pcfiles) ...@@ -924,12 +922,10 @@ $(nonplat_property_contexts.tmp): $(nonplat_pcfiles)
$(hide) m4 -s $(PRIVATE_ADDITIONAL_M4DEFS) $(PRIVATE_PC_FILES) > $@ $(hide) m4 -s $(PRIVATE_ADDITIONAL_M4DEFS) $(PRIVATE_PC_FILES) > $@
$(LOCAL_BUILT_MODULE): PRIVATE_SEPOLICY := $(built_sepolicy) $(LOCAL_BUILT_MODULE): $(nonplat_property_contexts.tmp) $(HOST_OUT_EXECUTABLES)/property_info_checker
$(LOCAL_BUILT_MODULE): PRIVATE_FC_SORT := $(HOST_OUT_EXECUTABLES)/fc_sort
$(LOCAL_BUILT_MODULE): $(nonplat_property_contexts.tmp) $(built_sepolicy) $(HOST_OUT_EXECUTABLES)/checkfc $(HOST_OUT_EXECUTABLES)/fc_sort
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(hide) $(PRIVATE_FC_SORT) $< $@ $(hide) cp -f $< $@
$(hide) $(HOST_OUT_EXECUTABLES)/checkfc -p $(PRIVATE_SEPOLICY) $@ $(hide) $(HOST_OUT_EXECUTABLES)/property_info_checker $@
built_nonplat_pc := $(LOCAL_BUILT_MODULE) built_nonplat_pc := $(LOCAL_BUILT_MODULE)
nonplat_pcfiles := nonplat_pcfiles :=
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment