summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Crowley <paulcrowley@google.com>2018-05-21 12:01:22 -0700
committerPaul Crowley <paulcrowley@google.com>2018-05-21 12:01:22 -0700
commit5cb44010b24e23f7839848c97e575f70113adcab (patch)
tree977c620d2d2dbc8068022f207e8f96e6429b839e
parentd58a8090787cbf60e775f8b953650f9fd1099f02 (diff)
downloaddevice_google_wahoo-5cb44010b24e23f7839848c97e575f70113adcab.tar.gz
device_google_wahoo-5cb44010b24e23f7839848c97e575f70113adcab.tar.bz2
device_google_wahoo-5cb44010b24e23f7839848c97e575f70113adcab.zip
Remove device-specific metadata policy that's now in platform.
Bug: 79781913 Test: compiles Change-Id: Ie632d1a4c44f491415ae9bb2ceb1264f0cfa5096
-rw-r--r--BoardConfig.mk2
-rw-r--r--sepolicy/vendor/file_contexts3
2 files changed, 1 insertions, 4 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index fbf60e28..b502a35b 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -79,7 +79,7 @@ TARGET_COPY_OUT_VENDOR := vendor
# Install odex files into the other system image
BOARD_USES_SYSTEM_OTHER_ODEX := true
-BOARD_ROOT_EXTRA_FOLDERS := persist firmware metadata
+BOARD_ROOT_EXTRA_FOLDERS := persist firmware
BOARD_SEPOLICY_DIRS += device/google/wahoo/sepolicy/vendor
BOARD_PLAT_PUBLIC_SEPOLICY_DIR := device/google/wahoo/sepolicy/public
diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
index c8141e48..1649712a 100644
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -285,8 +285,5 @@
/persist/time(/.*)? u:object_r:persist_time_file:s0
/persist/battery(/.*)? u:object_r:persist_battery_file:s0
-/metadata u:object_r:rootfs:s0
-/metadata/.* u:object_r:vold_data_file:s0
-
# b/70518189 vDSO experiments
/sys/module/vdso/parameters u:object_r:sysfs_vdso:s0