remove vcd from user ROM
Bug: 190331325
Test: build all ROM variants with only user ROM without vcd
Change-Id: If9dc555ee8582b605ccdf9d60c3a9c89cd6634d8
diff --git a/modem/userdebug/file_contexts b/modem/userdebug/file_contexts
new file mode 100644
index 0000000..20b74c6
--- /dev/null
+++ b/modem/userdebug/file_contexts
@@ -0,0 +1 @@
+/vendor/bin/vcd u:object_r:vcd_exec:s0
diff --git a/whitechapel/vendor/google/vcd.te b/modem/userdebug/vcd.te
similarity index 100%
rename from whitechapel/vendor/google/vcd.te
rename to modem/userdebug/vcd.te
diff --git a/public/property.te b/public/property.te
new file mode 100644
index 0000000..5f60d63
--- /dev/null
+++ b/public/property.te
@@ -0,0 +1,2 @@
+vendor_internal_prop(vendor_rild_prop)
+vendor_internal_prop(vendor_persist_config_default_prop)
diff --git a/whitechapel/vendor/google/file.te b/whitechapel/vendor/google/file.te
index 55d1f16..3694893 100644
--- a/whitechapel/vendor/google/file.te
+++ b/whitechapel/vendor/google/file.te
@@ -13,7 +13,6 @@
type vendor_sced_log_file, file_type, data_file_type;
type vendor_slog_file, file_type, data_file_type, mlstrustedobject;
type vendor_telephony_log_file, file_type, data_file_type;
-type vendor_vcd_log_file, file_type, data_file_type;
# app data files
type vendor_test_data_file, file_type, data_file_type;
diff --git a/whitechapel/vendor/google/file_contexts b/whitechapel/vendor/google/file_contexts
index 71864a0..d7a6f99 100644
--- a/whitechapel/vendor/google/file_contexts
+++ b/whitechapel/vendor/google/file_contexts
@@ -136,7 +136,6 @@
/(vendor|system/vendor)/bin/hw/rild_exynos u:object_r:rild_exec:s0
/(vendor|system/vendor)/bin/rfsd u:object_r:rfsd_exec:s0
/(vendor|system/vendor)/bin/sced u:object_r:sced_exec:s0
-/(vendor|system/vendor)/bin/vcd u:object_r:vcd_exec:s0
/(vendor|system/vendor)/bin/bipchmgr u:object_r:bipchmgr_exec:s0
# WFC
@@ -160,7 +159,6 @@
/data/vendor/log/sced(/.*)? u:object_r:vendor_sced_log_file:s0
/data/vendor/log/slog(/.*)? u:object_r:vendor_slog_file:s0
/data/vendor/slog(/.*)? u:object_r:vendor_slog_file:s0
-/data/vendor/log/vcd(/.*)? u:object_r:vendor_vcd_log_file:s0
/persist/sensorcal\.json u:object_r:sensors_cal_file:s0
diff --git a/whitechapel/vendor/google/property.te b/whitechapel/vendor/google/property.te
index 9454c2e..bc62032 100644
--- a/whitechapel/vendor/google/property.te
+++ b/whitechapel/vendor/google/property.te
@@ -2,7 +2,6 @@
vendor_internal_prop(vendor_prop)
vendor_internal_prop(vendor_ims_prop)
vendor_internal_prop(vendor_rcs_prop)
-vendor_internal_prop(vendor_rild_prop)
vendor_internal_prop(vendor_slog_prop)
vendor_internal_prop(sensors_prop)
vendor_internal_prop(vendor_ssrdump_prop)
@@ -15,7 +14,6 @@
# vendor defaults
vendor_internal_prop(vendor_config_default_prop)
vendor_internal_prop(vendor_ro_config_default_prop)
-vendor_internal_prop(vendor_persist_config_default_prop)
vendor_internal_prop(vendor_sys_default_prop)
vendor_internal_prop(vendor_ro_sys_default_prop)
vendor_internal_prop(vendor_persist_sys_default_prop)
