From 9ceb47b0c0f693e760d6ad0535f4a165491fa772 Mon Sep 17 00:00:00 2001
From: Kenny Root <kroot@google.com>
Date: Thu, 1 Nov 2012 13:17:29 -0700
Subject: [PATCH] Revert "Include su.te only for userdebug/eng builds."

This reverts commit af56ac19545ff083ceb3c1ddf4bf8e2663d4b934.

Change-Id: Id658a90b58ea31365051c0878c58393fd055fc69
---
 Android.mk                 | 17 ++---------------
 conditional/su.te => su.te |  0
 2 files changed, 2 insertions(+), 15 deletions(-)
 rename conditional/su.te => su.te (100%)

diff --git a/Android.mk b/Android.mk
index 202e3b27f..2cc0f22f7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -64,24 +64,11 @@ LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
 include $(BUILD_SYSTEM)/base_rules.mk
 
 sepolicy_policy.conf := $(intermediates)/policy.conf
-
-# Build up the list of policy files (the order matters, since they will all be
-# cat'd together)
-POLICY_DEPENDS := $(call build_policy, security_classes initial_sids access_vectors global_macros mls_macros mls policy_capabilities te_macros attributes *.te)
-
-# Add extra policy for "su", but only for eng and userdebug builds
-ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
-POLICY_DEPENDS += $(wildcard $(addprefix $(LOCAL_PATH)/conditional/, su.te))
-endif
-
-# Add in the rest of the policy
-POLICY_DEPENDS += $(call build_policy, roles users initial_sid_contexts fs_use genfs_contexts port_contexts)
-
 $(sepolicy_policy.conf): PRIVATE_MLS_SENS := $(MLS_SENS)
 $(sepolicy_policy.conf): PRIVATE_MLS_CATS := $(MLS_CATS)
-$(sepolicy_policy.conf) : $(POLICY_DEPENDS)
+$(sepolicy_policy.conf) : $(call build_policy, security_classes initial_sids access_vectors global_macros mls_macros mls policy_capabilities te_macros attributes *.te roles users initial_sid_contexts fs_use genfs_contexts port_contexts)
 	@mkdir -p $(dir $@)
-	$(hide) m4 -D mls_num_sens=$(PRIVATE_MLS_SENS) -D mls_num_cats=$(PRIVATE_MLS_CATS) -s $(POLICY_DEPENDS) > $@
+	$(hide) m4 -D mls_num_sens=$(PRIVATE_MLS_SENS) -D mls_num_cats=$(PRIVATE_MLS_CATS) -s $^ > $@
 
 $(LOCAL_BUILT_MODULE) : $(sepolicy_policy.conf) $(HOST_OUT_EXECUTABLES)/checkpolicy
 	@mkdir -p $(dir $@)
diff --git a/conditional/su.te b/su.te
similarity index 100%
rename from conditional/su.te
rename to su.te
-- 
GitLab