Merge "Move selinux_denial_metadata to /vendor."

am: f6014e8e62

Change-Id: I35c1228c8247358cb2ffd0ded4aab6fe3b864d86
This commit is contained in:
Tri Vo 2019-01-25 10:03:02 -08:00 committed by android-build-merger
commit 6825b77d79

View file

@ -217,12 +217,6 @@ LOCAL_REQUIRED_MODULES += \
endif # ($(PRODUCT_SEPOLICY_SPLIT),true)
ifneq ($(TARGET_BUILD_VARIANT), user)
LOCAL_REQUIRED_MODULES += \
selinux_denial_metadata \
endif
ifneq ($(with_asan),true)
ifneq ($(SELINUX_IGNORE_NEVERALLOWS),true)
LOCAL_REQUIRED_MODULES += \
@ -292,6 +286,12 @@ LOCAL_REQUIRED_MODULES += \
product_mapping_file \
product_sepolicy_and_mapping.sha256 \
endif
ifneq ($(TARGET_BUILD_VARIANT), user)
LOCAL_REQUIRED_MODULES += \
selinux_denial_metadata \
endif
include $(BUILD_PHONY_PACKAGE)
@ -1085,7 +1085,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := selinux_denial_metadata
LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/selinux
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc/selinux
include $(BUILD_SYSTEM)/base_rules.mk