diff options
| author | Kenny Root <kroot@google.com> | 2012-11-01 13:17:29 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2012-11-01 13:17:29 -0700 |
| commit | 9ceb47b0c0f693e760d6ad0535f4a165491fa772 (patch) | |
| tree | 8ecb1dd74a7d72e46c53657d76bb17f0b9cde168 | |
| parent | 83dde22099e69b7751d112b061ca22e24cac639c (diff) | |
| download | android_external_sepolicy-9ceb47b0c0f693e760d6ad0535f4a165491fa772.tar.gz android_external_sepolicy-9ceb47b0c0f693e760d6ad0535f4a165491fa772.tar.bz2 android_external_sepolicy-9ceb47b0c0f693e760d6ad0535f4a165491fa772.zip | |
Revert "Include su.te only for userdebug/eng builds."
This reverts commit af56ac19545ff083ceb3c1ddf4bf8e2663d4b934.
Change-Id: Id658a90b58ea31365051c0878c58393fd055fc69
| -rw-r--r-- | Android.mk | 17 | ||||
| -rw-r--r-- | su.te (renamed from conditional/su.te) | 0 |
2 files changed, 2 insertions, 15 deletions
@@ -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 index 75e6214..75e6214 100644 --- a/conditional/su.te +++ b/su.te |