Revert "Add vendor_property_type to vendor_default_prop"
This reverts commit d68d0ca0fc7f3001800dffc03f5e20723ef3d1ec.
Reason for revert: broke build
Change-Id: I52905a143a31829d3825a2aa07bbf09b957240f0
diff --git a/public/property.te b/public/property.te
index ffcb527..06df3d7 100644
--- a/public/property.te
+++ b/public/property.te
@@ -261,11 +261,7 @@
system_public_prop(vold_prop)
')
-type vendor_default_prop, property_type, vendor_property_type;
-
-treble_sysprop_neverallow(`
- typeattribute vendor_default_prop vendor_internal_property_type;
-')
+type vendor_default_prop, property_type;
typeattribute log_prop log_property_type;
typeattribute log_tag_prop log_property_type;
diff --git a/public/te_macros b/public/te_macros
index e9e139e..fdf0675 100644
--- a/public/te_macros
+++ b/public/te_macros
@@ -829,8 +829,6 @@
#
# CTS uses these rules only for devices launching with R or later.
#
-# TODO(b/131162102): deprecate BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW
-#
define(`treble_sysprop_neverallow', ifelse(target_treble_sysprop_neverallow, `true', $1,
ifelse(target_treble_sysprop_neverallow, `cts',
# BEGIN_LAUNCHING_WITH_R_ONLY -- this marker is used by CTS -- do not modify