Skip to content
Snippets Groups Projects
Commit 5408d540 authored by William Roberts's avatar William Roberts Committed by android-build-merger
Browse files

Merge \\\"property_contexts: strip blank lines and comments\\\" am: ee69a2e7 am: a584f2f6 

am: ab9c389e

Change-Id: I5d6a0151615d4e01fb0841e631dad58ec94d737b
parents 9724667e ab9c389e
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 5 additions and 5 deletions
Android.mk
+ 5
− 5
View file @ 5408d540
...@@ -359,10 +359,10 @@ $(property_contexts.tmp): $(all_pcfiles_with_nl) ...@@ -359,10 +359,10 @@ $(property_contexts.tmp): $(all_pcfiles_with_nl)
$(LOCAL_BUILT_MODULE): PRIVATE_SEPOLICY := $(built_sepolicy) $(LOCAL_BUILT_MODULE): PRIVATE_SEPOLICY := $(built_sepolicy)
$(LOCAL_BUILT_MODULE): $(property_contexts.tmp) $(built_sepolicy) $(HOST_OUT_EXECUTABLES)/checkfc $(ACP) $(LOCAL_BUILT_MODULE): $(property_contexts.tmp) $(built_sepolicy) $(HOST_OUT_EXECUTABLES)/checkfc
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(hide) $(ACP) $< $@ $(hide) sed -e 's/#.*$$//' -e '/^$$/d' $< > $@
$(hide) $(HOST_OUT_EXECUTABLES)/checkfc -p $(PRIVATE_SEPOLICY) $< $(hide) $(HOST_OUT_EXECUTABLES)/checkfc -p $(PRIVATE_SEPOLICY) $@
built_pc := $(LOCAL_BUILT_MODULE) built_pc := $(LOCAL_BUILT_MODULE)
all_pc_files := all_pc_files :=
...@@ -386,8 +386,8 @@ $(general_property_contexts.tmp): $(addprefix $(LOCAL_PATH)/, property_contexts) ...@@ -386,8 +386,8 @@ $(general_property_contexts.tmp): $(addprefix $(LOCAL_PATH)/, property_contexts)
$(LOCAL_BUILT_MODULE): PRIVATE_SEPOLICY := $(built_general_sepolicy) $(LOCAL_BUILT_MODULE): PRIVATE_SEPOLICY := $(built_general_sepolicy)
$(LOCAL_BUILT_MODULE): $(general_property_contexts.tmp) $(built_general_sepolicy) $(HOST_OUT_EXECUTABLES)/checkfc $(ACP) $(LOCAL_BUILT_MODULE): $(general_property_contexts.tmp) $(built_general_sepolicy) $(HOST_OUT_EXECUTABLES)/checkfc $(ACP)
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(hide) $(ACP) $< $@ $(hide) sed -e 's/#.*$$//' -e '/^$$/d' $< > $@
$(hide) $(HOST_OUT_EXECUTABLES)/checkfc -p $(PRIVATE_SEPOLICY) $< $(hide) $(HOST_OUT_EXECUTABLES)/checkfc -p $(PRIVATE_SEPOLICY) $@
general_property_contexts.tmp := general_property_contexts.tmp :=
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment