From 4df603a038439048105993673aa47dbc57850ea3 Mon Sep 17 00:00:00 2001 From: Dario Freni <dariofreni@google.com> Date: Thu, 22 Nov 2018 18:38:26 +0000 Subject: [PATCH] Remove permission for APEX manifest. There is no real need to access the manifest.json (which is being renamed in other CLs anyway). So remove the access to it. Bug: 119672727 Test: m, installed on device, boots. Change-Id: I2d82062031da36f871b2a64d97a50a6f1e6fc3dd --- apex/apex.test-file_contexts | 5 ++--- apex/com.android.media-file_contexts | 3 +-- apex/com.android.resolv-file_contexts | 3 +-- apex/com.android.runtime.debug-file_contexts | 5 ----- apex/com.android.runtime.release-file_contexts | 5 ----- apex/com.android.tzdata-file_contexts | 2 -- 6 files changed, 4 insertions(+), 19 deletions(-) diff --git a/apex/apex.test-file_contexts b/apex/apex.test-file_contexts index 3dffd86d5..784ad5473 100644 --- a/apex/apex.test-file_contexts +++ b/apex/apex.test-file_contexts @@ -1,3 +1,2 @@ -/manifest\.json u:object_r:system_file:s0 -(/.*)? u:object_r:system_file:s0 -/bin/surfaceflinger u:object_r:surfaceflinger_exec:s0 +(/.*)? u:object_r:system_file:s0 +/bin/surfaceflinger u:object_r:surfaceflinger_exec:s0 diff --git a/apex/com.android.media-file_contexts b/apex/com.android.media-file_contexts index 7dd840b3b..f6b21daaa 100644 --- a/apex/com.android.media-file_contexts +++ b/apex/com.android.media-file_contexts @@ -1,3 +1,2 @@ (/.*)? u:object_r:system_file:s0 -/manifest\.json u:object_r:system_file:s0 -/lib(64)?(/.*) u:object_r:system_lib_file:s0 +/lib(64)?(/.*) u:object_r:system_lib_file:s0 diff --git a/apex/com.android.resolv-file_contexts b/apex/com.android.resolv-file_contexts index 7dd840b3b..f6b21daaa 100644 --- a/apex/com.android.resolv-file_contexts +++ b/apex/com.android.resolv-file_contexts @@ -1,3 +1,2 @@ (/.*)? u:object_r:system_file:s0 -/manifest\.json u:object_r:system_file:s0 -/lib(64)?(/.*) u:object_r:system_lib_file:s0 +/lib(64)?(/.*) u:object_r:system_lib_file:s0 diff --git a/apex/com.android.runtime.debug-file_contexts b/apex/com.android.runtime.debug-file_contexts index 4d0df809e..98948d23d 100644 --- a/apex/com.android.runtime.debug-file_contexts +++ b/apex/com.android.runtime.debug-file_contexts @@ -1,8 +1,3 @@ -############################# -# APEX module manifest. -# -/manifest\.json u:object_r:system_file:s0 - ############################# # System files # diff --git a/apex/com.android.runtime.release-file_contexts b/apex/com.android.runtime.release-file_contexts index 79b87545f..08688fbc6 100644 --- a/apex/com.android.runtime.release-file_contexts +++ b/apex/com.android.runtime.release-file_contexts @@ -1,8 +1,3 @@ -############################# -# APEX module manifest. -# -/manifest\.json u:object_r:system_file:s0 - ############################# # System files # diff --git a/apex/com.android.tzdata-file_contexts b/apex/com.android.tzdata-file_contexts index 6ec4a0adb..5aaec50ad 100644 --- a/apex/com.android.tzdata-file_contexts +++ b/apex/com.android.tzdata-file_contexts @@ -1,5 +1,3 @@ -/manifest\.json u:object_r:system_file:s0 - (/.*)? u:object_r:system_file:s0 /etc(/.*)? u:object_r:system_zoneinfo_file:s0 -- GitLab