commit f6014e8e62ebee7cfa1d59307d4f0c6dd8771ebb
author Tri Vo <trong@google.com> Fri Jan 25 17:51:48 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 25 17:51:48 2019 +0000
tree 171bc0b6f6e7a731c73d84fd9d65ca20baabd347
parent a310da9aeceb727c0f61247a77c47f9e3538dc48
parent 4eb68150aa0cf79dd375d80886aa59c693e5bcda

Merge "Move selinux_denial_metadata to /vendor."

Android.mk

diff --git a/Android.mk b/Android.mk
index a6c4f2a..eed488a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -217,12 +217,6 @@
 
 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 += \
@@ -293,6 +287,12 @@
     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 @@
 
 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