From d4416d55a682cf0b343ac9dedb885ee726881691 Mon Sep 17 00:00:00 2001 From: Guang Zhu Date: Fri, 28 Apr 2017 23:56:52 +0000 Subject: [PATCH] Revert "Enable metadata encryption" Bug: 37792477 This reverts commit 0494fb84bc1071fce7e72b7ff37ce9166c4d7d66. Change-Id: I119f97f1141ee69fa2902ef9931dde4b01492831 --- BoardConfig.mk | 2 +- sepolicy/file_contexts | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index 0d9a1755..78ca3099 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -65,7 +65,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 diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts index 6ee97b11..9b9644a9 100644 --- a/sepolicy/file_contexts +++ b/sepolicy/file_contexts @@ -270,7 +270,3 @@ /persist/data(/.*)? u:object_r:persist_data_file:s0 /persist/display(/.*)? u:object_r:persist_display_file:s0 /persist/sensors(/.*)? u:object_r:persist_sensors_file:s0 - -/metadata u:object_r:rootfs:s0 -/metadata/.* u:object_r:vold_data_file:s0 -