am 48d98e35: Merge "system_server: remove old dalvik JIT rules on user/userdebug builds"

* commit '48d98e35419f74fe515ec560277726081c2fd0e3':
  system_server: remove old dalvik JIT rules on user/userdebug builds
This commit is contained in:
Nick Kralevich 2015-08-24 22:09:38 +00:00 committed by Android Git Automerger
commit e9ac2d6d5d
2 changed files with 7 additions and 4 deletions

View file

@ -7,10 +7,12 @@ type system_server, domain, mlstrustedsubject;
# Define a type for tmpfs-backed ashmem regions.
tmpfs_domain(system_server)
# Dalvik Compiler JIT Mapping.
allow system_server self:process execmem;
allow system_server ashmem_device:chr_file execute;
allow system_server system_server_tmpfs:file execute;
eng(`
# JIT mappings
allow system_server self:process execmem;
allow system_server ashmem_device:chr_file execute;
allow system_server system_server_tmpfs:file execute;
')
# For art.
allow system_server dalvikcache_data_file:file execute;

View file

@ -311,6 +311,7 @@ define(`recovery_only', ifelse(target_recovery, `true', $1, ))
# SELinux rules which apply only to userdebug or eng builds
#
define(`userdebug_or_eng', ifelse(target_build_variant, `eng', $1, ifelse(target_build_variant, `userdebug', $1)))
define(`eng', ifelse(target_build_variant, `eng', $1))
#####################################
# write_logd(domain)