commit 467f85bb8abce27b601447efebfff9f862d0b10c
author Ying Wang <wangying@google.com> Fri Oct 26 09:54:19 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 26 09:54:19 2012 -0700
tree 7c6ae88393d7b0deb3e5f47e1b066a39a030b2be
parent f1cd33ff0564dfccf02d994ce793cd0d139a4717
parent 6b964fa1f265c1c0d6f236efbf3c471b76fdf05c

am 6b964fa1: am d8b122c7: Use file target as dependency.

* commit '6b964fa1f265c1c0d6f236efbf3c471b76fdf05c':
  Use file target as dependency.

Android.mk

diff --git a/Android.mk b/Android.mk
index 6f5d5c6..2d59460 100644
--- a/Android.mk
+++ b/Android.mk
@@ -57,6 +57,7 @@
 	@mkdir -p $(dir $@)
 	$(hide) $(HOST_OUT_EXECUTABLES)/checkpolicy -M -c $(POLICYVERS) -o $@ $<
 
+built_sepolicy := $(LOCAL_BUILT_MODULE)
 sepolicy_policy.conf :=
 
 ###################################
@@ -83,11 +84,11 @@
 
 ALL_FC_FILES := $(LOCAL_PATH)/file_contexts $(LOCAL_POLICY_FC)
 
-file_contexts := $(intermediates)/file_contexts
-$(file_contexts):  $(ALL_FC_FILES) sepolicy $(HOST_OUT_EXECUTABLES)/checkfc
+$(LOCAL_BUILT_MODULE): PRIVATE_SEPOLICY := $(built_sepolicy)
+$(LOCAL_BUILT_MODULE):  $(ALL_FC_FILES) $(built_sepolicy) $(HOST_OUT_EXECUTABLES)/checkfc
 	@mkdir -p $(dir $@)
 	$(hide) m4 -s $(ALL_FC_FILES) > $@
-	$(hide) $(HOST_OUT_EXECUTABLES)/checkfc $(TARGET_ROOT_OUT)/sepolicy $@
+	$(hide) $(HOST_OUT_EXECUTABLES)/checkfc $(PRIVATE_SEPOLICY) $@
 
 file_contexts :=
 
@@ -105,11 +106,13 @@
 	@mkdir -p $(dir $@)
 	$(hide) m4 -s $^ > $@
 
-$(LOCAL_BUILT_MODULE) : $(seapp_contexts.tmp) $(TARGET_ROOT_OUT)/sepolicy $(HOST_OUT_EXECUTABLES)/checkseapp
+$(LOCAL_BUILT_MODULE): PRIVATE_SEPOLICY := $(built_sepolicy)
+$(LOCAL_BUILT_MODULE) : $(seapp_contexts.tmp) $(built_sepolicy) $(HOST_OUT_EXECUTABLES)/checkseapp
 	@mkdir -p $(dir $@)
-	$(HOST_OUT_EXECUTABLES)/checkseapp -p $(TARGET_ROOT_OUT)/sepolicy -o $@ $<
+	$(HOST_OUT_EXECUTABLES)/checkseapp -p $(PRIVATE_SEPOLICY) -o $@ $<
 
 seapp_contexts.tmp :=
+built_sepolicy :=
 ##################################
 include $(CLEAR_VARS)