Merge "Move sepolicy and recovery from on-device tree and add dependency."
This commit is contained in:
commit
2d4d8842e7
1 changed files with 6 additions and 3 deletions
|
@ -338,7 +338,7 @@ include $(CLEAR_VARS)
|
|||
LOCAL_MODULE := sepolicy
|
||||
LOCAL_MODULE_CLASS := ETC
|
||||
LOCAL_MODULE_TAGS := optional
|
||||
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
|
||||
LOCAL_MODULE_PATH := $(TARGET_OUT_INTERMEDIATES)
|
||||
|
||||
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_ROOT_OUT)
|
||||
LOCAL_MODULE_PATH := $(TARGET_OUT_INTERMEDIATES)
|
||||
|
||||
include $(BUILD_SYSTEM)/base_rules.mk
|
||||
|
||||
|
@ -548,6 +548,7 @@ $(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 :=
|
||||
|
||||
##################################
|
||||
|
@ -916,7 +917,8 @@ LOCAL_MODULE_TAGS := optional
|
|||
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
|
||||
|
||||
include $(BUILD_SYSTEM)/base_rules.mk
|
||||
$(LOCAL_BUILT_MODULE): $(built_sepolicy) $(built_pc) $(built_fc) $(built_sc) $(built_svc)
|
||||
$(LOCAL_BUILT_MODULE): $(built_sepolicy) $(built_sepolicy.recovery) $(built_pc) \
|
||||
$(built_fc) $(built_sc) $(built_svc)
|
||||
@mkdir -p $(dir $@)
|
||||
$(hide) echo -n $(BUILD_FINGERPRINT_FROM_FILE) > $@
|
||||
|
||||
|
@ -932,6 +934,7 @@ built_nl :=
|
|||
built_pc :=
|
||||
built_sc :=
|
||||
built_sepolicy :=
|
||||
built_sepolicy.recovery :=
|
||||
built_svc :=
|
||||
mapping_policy_nvr :=
|
||||
mapping_policy_nvr.recovery :=
|
||||
|
|
Loading…
Reference in a new issue