Merge "Adding module for selinux bug metadata feature"

This commit is contained in:
Max Bires 2017-09-08 00:35:30 +00:00 committed by Android (Google) Code Review
commit 5476d347ee

View file

@ -230,6 +230,12 @@ ifneq ($(PRODUCT_FULL_TREBLE),true)
LOCAL_REQUIRED_MODULES += nonplat_service_contexts LOCAL_REQUIRED_MODULES += nonplat_service_contexts
endif endif
ifneq ($(TARGET_BUILD_VARIANT), user)
LOCAL_REQUIRED_MODULES += \
selinux_denial_metadata \
endif
ifneq ($(with_asan),true) ifneq ($(with_asan),true)
LOCAL_REQUIRED_MODULES += \ LOCAL_REQUIRED_MODULES += \
sepolicy_tests \ sepolicy_tests \
@ -672,6 +678,24 @@ file_contexts.device.sorted.tmp :=
file_contexts.device.tmp := file_contexts.device.tmp :=
file_contexts.local.tmp := file_contexts.local.tmp :=
##################################
ifneq ($(TARGET_BUILD_VARIANT), user)
include $(CLEAR_VARS)
LOCAL_MODULE := selinux_denial_metadata
LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/selinux
include $(BUILD_SYSTEM)/base_rules.mk
bug_files := $(call build_policy, bug_map, $(LOCAL_PATH) $(PLAT_PRIVATE_POLICY) $(PLAT_VENDOR_POLICY) $(BOARD_SEPOLICY_DIRS) $(PLAT_PUBLIC_POLICY))
$(LOCAL_BUILT_MODULE) : $(bug_files)
@mkdir -p $(dir $@)
cat $^ > $@
bug_files :=
endif
################################## ##################################
include $(CLEAR_VARS) include $(CLEAR_VARS)