diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-11-01 14:21:26 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-01 14:21:26 -0700 |
| commit | eab23895cd13ccb2a552dd9713bd1e88cf41e522 (patch) | |
| tree | d9bb731b8453bc6cb739958491d56e04f0cf9257 /Android.mk | |
| parent | 8c87a18d39db0104d97d72ed51e4654c9d29fd4b (diff) | |
| parent | 9ceb47b0c0f693e760d6ad0535f4a165491fa772 (diff) | |
| download | android_external_sepolicy-eab23895cd13ccb2a552dd9713bd1e88cf41e522.tar.gz android_external_sepolicy-eab23895cd13ccb2a552dd9713bd1e88cf41e522.tar.bz2 android_external_sepolicy-eab23895cd13ccb2a552dd9713bd1e88cf41e522.zip | |
Merge "Revert "Include su.te only for userdebug/eng builds."" into jb-mr1-dev-plus-aosp
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 17 |
1 files changed, 2 insertions, 15 deletions
@@ -62,24 +62,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 $@) |