From 5cb44010b24e23f7839848c97e575f70113adcab Mon Sep 17 00:00:00 2001 From: Paul Crowley Date: Mon, 21 May 2018 12:01:22 -0700 Subject: Remove device-specific metadata policy that's now in platform. Bug: 79781913 Test: compiles Change-Id: Ie632d1a4c44f491415ae9bb2ceb1264f0cfa5096 --- BoardConfig.mk | 2 +- sepolicy/vendor/file_contexts | 3 --- 2 files changed, 1 insertion(+), 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 -- cgit v1.2.3