commit be09a520c52b86e7ca473c3fefa8dd0cb6ca48be
author Ying Wang <wangying@google.com> Wed Nov 21 12:22:23 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 21 12:22:23 2012 -0800
tree 031b5fd5b1e7c484939dd0f652e2140eea71a493
parent 136383549fb554d91938ddf352cc713abfac9d73
parent 71958cca5d5d5b569a2bb2ad2a4baf53045334e9

am 71958cca: Merge "Establish explicit dependency on selinux file_contexts."

* commit '71958cca5d5d5b569a2bb2ad2a4baf53045334e9':
  Establish explicit dependency on selinux file_contexts.

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 49a94c8..7ce82a0 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -570,6 +570,9 @@
 endif
 INTERNAL_USERIMAGES_BINARY_PATHS := $(sort $(dir $(INTERNAL_USERIMAGES_DEPS)))
 
+SELINUX_FC := $(TARGET_ROOT_OUT)/file_contexts
+INTERNAL_USERIMAGES_DEPS += $(SELINUX_FC)
+
 # $(1): the path of the output dictionary file
 define generate-userimage-prop-dictionary
 $(if $(INTERNAL_USERIMAGES_EXT_VARIANT),$(hide) echo "fs_type=$(INTERNAL_USERIMAGES_EXT_VARIANT)" >> $(1))
@@ -579,7 +582,7 @@
 $(if $(BOARD_CACHEIMAGE_PARTITION_SIZE),$(hide) echo "cache_size=$(BOARD_CACHEIMAGE_PARTITION_SIZE)" >> $(1))
 $(if $(INTERNAL_USERIMAGES_SPARSE_EXT_FLAG),$(hide) echo "extfs_sparse_flag=$(INTERNAL_USERIMAGES_SPARSE_EXT_FLAG)" >> $(1))
 $(if $(mkyaffs2_extra_flags),$(hide) echo "mkyaffs2_extra_flags=$(mkyaffs2_extra_flags)" >> $(1))
-$(hide) echo "selinux_fc=$(TARGET_ROOT_OUT)/file_contexts" >> $(1)
+$(hide) echo "selinux_fc=$(SELINUX_FC)" >> $(1)
 endef
 
 # -----------------------------------------------------------------