Skip to content
Snippets Groups Projects
Commit 68e6109d authored by Alex Klyubin's avatar Alex Klyubin Committed by android-build-merger
Browse files

Vendor domains must not use Binder am: f5446eb1 am: 2fe065d7

am: 49ce4394

Change-Id: I1b38d903e61188594d0de80be479e7d9e045fb26
parents 463f9a49 49ce4394
No related branches found
No related tags found
No related merge requests found
Showing with 32 additions and 12 deletions
...@@ -158,6 +158,7 @@ $(reqd_policy_mask.conf): $(call build_policy, $(sepolicy_build_files), $(REQD_M ...@@ -158,6 +158,7 @@ $(reqd_policy_mask.conf): $(call build_policy, $(sepolicy_build_files), $(REQD_M
-D target_with_dexpreopt=$(WITH_DEXPREOPT) \ -D target_with_dexpreopt=$(WITH_DEXPREOPT) \
-D target_arch=$(PRIVATE_TGT_ARCH) \ -D target_arch=$(PRIVATE_TGT_ARCH) \
-D target_with_asan=$(PRIVATE_TGT_WITH_ASAN) \ -D target_with_asan=$(PRIVATE_TGT_WITH_ASAN) \
-D target_full_treble=$(PRODUCT_FULL_TREBLE) \
-s $^ > $@ -s $^ > $@
reqd_policy_mask.cil := $(intermediates)/reqd_policy_mask.cil reqd_policy_mask.cil := $(intermediates)/reqd_policy_mask.cil
...@@ -188,6 +189,7 @@ $(BOARD_SEPOLICY_VERS_DIR) $(REQD_MASK_POLICY)) ...@@ -188,6 +189,7 @@ $(BOARD_SEPOLICY_VERS_DIR) $(REQD_MASK_POLICY))
-D target_with_dexpreopt=$(WITH_DEXPREOPT) \ -D target_with_dexpreopt=$(WITH_DEXPREOPT) \
-D target_arch=$(PRIVATE_TGT_ARCH) \ -D target_arch=$(PRIVATE_TGT_ARCH) \
-D target_with_asan=$(PRIVATE_TGT_WITH_ASAN) \ -D target_with_asan=$(PRIVATE_TGT_WITH_ASAN) \
-D target_full_treble=$(PRODUCT_FULL_TREBLE) \
-s $^ > $@ -s $^ > $@
plat_pub_policy.cil := $(intermediates)/plat_pub_policy.cil plat_pub_policy.cil := $(intermediates)/plat_pub_policy.cil
...@@ -243,6 +245,7 @@ $(PLAT_PUBLIC_POLICY) $(PLAT_PRIVATE_POLICY)) ...@@ -243,6 +245,7 @@ $(PLAT_PUBLIC_POLICY) $(PLAT_PRIVATE_POLICY))
-D target_with_dexpreopt=$(WITH_DEXPREOPT) \ -D target_with_dexpreopt=$(WITH_DEXPREOPT) \
-D target_arch=$(PRIVATE_TGT_ARCH) \ -D target_arch=$(PRIVATE_TGT_ARCH) \
-D target_with_asan=$(PRIVATE_TGT_WITH_ASAN) \ -D target_with_asan=$(PRIVATE_TGT_WITH_ASAN) \
-D target_full_treble=$(PRODUCT_FULL_TREBLE) \
-s $^ > $@ -s $^ > $@
$(hide) sed '/dontaudit/d' $@ > $@.dontaudit $(hide) sed '/dontaudit/d' $@ > $@.dontaudit
...@@ -342,6 +345,7 @@ $(BOARD_SEPOLICY_VERS_DIR) $(REQD_MASK_POLICY) $(PLAT_VENDOR_POLICY) $(BOARD_SEP ...@@ -342,6 +345,7 @@ $(BOARD_SEPOLICY_VERS_DIR) $(REQD_MASK_POLICY) $(PLAT_VENDOR_POLICY) $(BOARD_SEP
-D target_with_dexpreopt=$(WITH_DEXPREOPT) \ -D target_with_dexpreopt=$(WITH_DEXPREOPT) \
-D target_arch=$(PRIVATE_TGT_ARCH) \ -D target_arch=$(PRIVATE_TGT_ARCH) \
-D target_with_asan=$(PRIVATE_TGT_WITH_ASAN) \ -D target_with_asan=$(PRIVATE_TGT_WITH_ASAN) \
-D target_full_treble=$(PRODUCT_FULL_TREBLE) \
-s $^ > $@ -s $^ > $@
$(hide) sed '/dontaudit/d' $@ > $@.dontaudit $(hide) sed '/dontaudit/d' $@ > $@.dontaudit
......
### ADB daemon ### ADB daemon
typeattribute adbd coredomain;
typeattribute adbd mlstrustedsubject; typeattribute adbd mlstrustedsubject;
domain_auto_trans(adbd, shell_exec, shell) domain_auto_trans(adbd, shell_exec, shell)
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
type atrace_exec, exec_type, file_type; type atrace_exec, exec_type, file_type;
userdebug_or_eng(` userdebug_or_eng(`
type atrace, domain, domain_deprecated; type atrace, domain, coredomain, domain_deprecated;
init_daemon_domain(atrace) init_daemon_domain(atrace)
......
# audioserver - audio services daemon # audioserver - audio services daemon
typeattribute audioserver coredomain;
type audioserver_exec, exec_type, file_type; type audioserver_exec, exec_type, file_type;
init_daemon_domain(audioserver) init_daemon_domain(audioserver)
......
allow binder_in_vendor_violators binder_device:chr_file rw_file_perms;
# blkid called from vold # blkid called from vold
typeattribute blkid coredomain;
type blkid_exec, exec_type, file_type; type blkid_exec, exec_type, file_type;
# Allowed read-only access to encrypted devices to extract UUID/label # Allowed read-only access to encrypted devices to extract UUID/label
......
# blkid for untrusted block devices # blkid for untrusted block devices
typeattribute blkid_untrusted coredomain;
# Allowed read-only access to vold block devices to extract UUID/label # Allowed read-only access to vold block devices to extract UUID/label
allow blkid_untrusted block_device:dir search; allow blkid_untrusted block_device:dir search;
allow blkid_untrusted vold_device:blk_file r_file_perms; allow blkid_untrusted vold_device:blk_file r_file_perms;
......
# bluetooth subsystem # bluetooth subsystem
typeattribute bluetooth coredomain;
typeattribute bluetooth domain_deprecated; typeattribute bluetooth domain_deprecated;
app_domain(bluetooth) app_domain(bluetooth)
......
# type_transition must be private policy the domain_trans rules could stay typeattribute bootanim coredomain;
# public, but conceptually should go with this
init_daemon_domain(bootanim) init_daemon_domain(bootanim)
# type_transition must be private policy the domain_trans rules could stay typeattribute bootstat coredomain;
# public, but conceptually should go with this
init_daemon_domain(bootstat) init_daemon_domain(bootstat)
typeattribute bufferhubd coredomain;
init_daemon_domain(bufferhubd) init_daemon_domain(bufferhubd)
# type_transition must be private policy the domain_trans rules could stay typeattribute cameraserver coredomain;
# public, but conceptually should go with this
init_daemon_domain(cameraserver) init_daemon_domain(cameraserver)
typeattribute charger coredomain;
typeattribute clatd coredomain;
# type_transition must be private policy the domain_trans rules could stay typeattribute cppreopts coredomain;
# public, but conceptually should go with this
# Technically not a daemon but we do want the transition from init domain to # Technically not a daemon but we do want the transition from init domain to
# cppreopts to occur. # cppreopts to occur.
init_daemon_domain(cppreopts) init_daemon_domain(cppreopts)
......
typeattribute crash_dump coredomain;
typeattribute dex2oat coredomain;
# dexoptanalyzer # dexoptanalyzer
type dexoptanalyzer, domain, mlstrustedsubject; type dexoptanalyzer, domain, coredomain, mlstrustedsubject;
type dexoptanalyzer_exec, exec_type, file_type; type dexoptanalyzer_exec, exec_type, file_type;
# Reading an APK opens a ZipArchive, which unpack to tmpfs. # Reading an APK opens a ZipArchive, which unpack to tmpfs.
......
# type_transition must be private policy the domain_trans rules could stay typeattribute dhcp coredomain;
# public, but conceptually should go with this
init_daemon_domain(dhcp) init_daemon_domain(dhcp)
type_transition dhcp system_data_file:{ dir file } dhcp_data_file; type_transition dhcp system_data_file:{ dir file } dhcp_data_file;
typeattribute dnsmasq coredomain;
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment