Merge "Revert "Move sepolicy and recovery from on-device tree and add...

Merge "Revert "Move sepolicy and recovery from on-device tree and add dependency."" am: c81c44a8 am: 33b3a1ea
am: 0ef4fa20

Change-Id: I41d83206c55055d28d33c673e1814d8daa816c54

Android.mk

@@ -338,7 +338,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := sepolicy
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_PATH := $(TARGET_OUT_INTERMEDIATES)
+LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
 
 include $(BUILD_SYSTEM)/base_rules.mk
 
@@ -525,7 +525,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := sepolicy.recovery
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_PATH := $(TARGET_OUT_INTERMEDIATES)
+LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
 
 include $(BUILD_SYSTEM)/base_rules.mk
 
@@ -548,7 +548,6 @@ $(LOCAL_BUILT_MODULE): $(HOST_OUT_EXECUTABLES)/secilc $(HOST_OUT_EXECUTABLES)/se
 		fi
 	$(hide) mv $@.tmp $@
 
-built_sepolicy.recovery := $(LOCAL_BUILT_MODULE)
 all_cil_files.recovery :=
 
 ##################################
@@ -917,8 +916,7 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
 
 include $(BUILD_SYSTEM)/base_rules.mk
-$(LOCAL_BUILT_MODULE): $(built_sepolicy) $(built_sepolicy.recovery) $(built_pc) \
-$(built_fc) $(built_sc) $(built_svc)
+$(LOCAL_BUILT_MODULE): $(built_sepolicy) $(built_pc) $(built_fc) $(built_sc) $(built_svc)
 	@mkdir -p $(dir $@)
 	$(hide) echo -n $(BUILD_FINGERPRINT_FROM_FILE) > $@
 
@@ -934,7 +932,6 @@ built_nl :=
 built_pc :=
 built_sc :=
 built_sepolicy :=
-built_sepolicy.recovery :=
 built_svc :=
 mapping_policy_nvr :=
 mapping_policy_nvr.recovery :=