Merge "Make hal_configstore consistent."
diff --git a/Android.mk b/Android.mk
index e1adea4..729f3b4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -769,6 +769,7 @@
$(LOCAL_BUILT_MODULE): PRIVATE_WITH_ASAN := false
$(LOCAL_BUILT_MODULE): PRIVATE_SEPOLICY_SPLIT := cts
$(LOCAL_BUILT_MODULE): PRIVATE_COMPATIBLE_PROPERTY := cts
+$(LOCAL_BUILT_MODULE): PRIVATE_EXCLUDE_BUILD_TEST := true
$(LOCAL_BUILT_MODULE): $(call build_policy, $(sepolicy_build_files), \
$(PLAT_PUBLIC_POLICY) $(PLAT_PRIVATE_POLICY))
$(transform-policy-to-conf)
diff --git a/definitions.mk b/definitions.mk
index 4b9e098..36b75ac 100644
--- a/definitions.mk
+++ b/definitions.mk
@@ -10,6 +10,7 @@
-D target_with_asan=$(PRIVATE_TGT_WITH_ASAN) \
-D target_full_treble=$(PRIVATE_SEPOLICY_SPLIT) \
-D target_compatible_property=$(PRIVATE_COMPATIBLE_PROPERTY) \
+ -D target_exclude_build_test=$(PRIVATE_EXCLUDE_BUILD_TEST) \
$(PRIVATE_TGT_RECOVERY) \
-s $^ > $@
endef
diff --git a/public/attributes b/public/attributes
index 0ec789c..90e1148 100644
--- a/public/attributes
+++ b/public/attributes
@@ -77,6 +77,11 @@
# All properties used to configure log filtering.
attribute log_property_type;
+# All properties that are not specific to device but are added from
+# outside of AOSP. (e.g. OEM-specific properties)
+# These properties are not accessible from device-specific domains
+attribute extended_core_property_type;
+
# All service_manager types created by system_server
attribute system_server_service;
diff --git a/public/property.te b/public/property.te
index c9bcb86..8113b82 100644
--- a/public/property.te
+++ b/public/property.te
@@ -160,6 +160,7 @@
-vendor_init
} {
core_property_type
+ extended_core_property_type
exported_config_prop
exported_dalvik_prop
exported_default_prop
@@ -256,6 +257,7 @@
-vendor_init
} {
core_property_type
+ extended_core_property_type
exported_dalvik_prop
exported_ffs_prop
exported_system_radio_prop
@@ -369,6 +371,7 @@
-exported_system_radio_prop
-exported_vold_prop
-exported_wifi_prop
+ -extended_core_property_type
-ffs_prop
-fingerprint_prop
-firstboot_prop
diff --git a/public/te_macros b/public/te_macros
index 949cad9..cdfdc89 100644
--- a/public/te_macros
+++ b/public/te_macros
@@ -213,10 +213,15 @@
attribute hal_$1_server;
expandattribute hal_$1_server false;
-neverallow { hal_$1_server -hal_$1 } domain:process fork;
neverallow { hal_$1_server -halserverdomain } domain:process fork;
+# hal_*_client and halclientdomain attributes are always expanded for
+# performance reasons. Neverallow rules targeting expanded attributes can not be
+# verified by CTS since these attributes are already expanded by that time.
+build_test_only(`
+neverallow { hal_$1_server -hal_$1 } domain:process fork;
neverallow { hal_$1_client -halclientdomain } domain:process fork;
')
+')
#####################################
# hal_server_domain(domain, hal_type)
@@ -498,6 +503,12 @@
#
define(`with_asan', ifelse(target_with_asan, `true', userdebug_or_eng(`$1'), ))
+#####################################
+# Build-time-only test
+# SELinux rules which are verified during build, but not as part of *TS testing.
+#
+define(`build_test_only', ifelse(target_exclude_build_test, `true', , $1))
+
####################################
# Fallback crash handling for processes that can't exec crash_dump (e.g. because of seccomp).
#
@@ -613,7 +624,9 @@
# Used to pair hal_foo_client with hal_foo_hwservice
define(`hal_attribute_hwservice', `
allow $1_client $2:hwservice_manager find;
- neverallow { domain -$1_client -$1_server } $2:hwservice_manager find;
-
add_hwservice($1_server, $2)
+
+ build_test_only(`
+ neverallow { domain -$1_client -$1_server } $2:hwservice_manager find;
+ ')
')
