commit 7f2ae3f12ecb609417f8df1dcc56ae4b42c8995c
author Dario Freni <dariofreni@google.com> Sat Nov 24 13:28:58 2018 -0800
committer android-build-merger <android-build-merger@google.com> Sat Nov 24 13:28:58 2018 -0800
tree eec61fd19ad1b6c87daaaa7e2e52c44a6330a5a7
parent 0d2fb089171dcb410836f28fc64e57ca22c27257
parent 37e101f32058470217bf26be5e031418dbe2cce2

Merge "Remove permission for APEX manifest." am: c3b3fdf8d6 am: dab41761f5
am: 37e101f320

Change-Id: I11dc585f11ecd96295610bf53a26d781cdd4cd37

apex/apex.test-file_contexts

diff --git a/apex/apex.test-file_contexts b/apex/apex.test-file_contexts
index 3dffd86..784ad54 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

apex/com.android.media-file_contexts

diff --git a/apex/com.android.media-file_contexts b/apex/com.android.media-file_contexts
index 7dd840b..f6b21da 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

apex/com.android.resolv-file_contexts

diff --git a/apex/com.android.resolv-file_contexts b/apex/com.android.resolv-file_contexts
index 7dd840b..f6b21da 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

apex/com.android.runtime.debug-file_contexts

diff --git a/apex/com.android.runtime.debug-file_contexts b/apex/com.android.runtime.debug-file_contexts
index 4d0df80..98948d2 100644
--- a/apex/com.android.runtime.debug-file_contexts
+++ b/apex/com.android.runtime.debug-file_contexts
@@ -1,9 +1,4 @@
 #############################
-# APEX module manifest.
-#
-/manifest\.json          u:object_r:system_file:s0
-
-#############################
 # System files
 #
 (/.*)?                   u:object_r:system_file:s0

apex/com.android.runtime.release-file_contexts

diff --git a/apex/com.android.runtime.release-file_contexts b/apex/com.android.runtime.release-file_contexts
index 79b8754..08688fb 100644
--- a/apex/com.android.runtime.release-file_contexts
+++ b/apex/com.android.runtime.release-file_contexts
@@ -1,9 +1,4 @@
 #############################
-# APEX module manifest.
-#
-/manifest\.json          u:object_r:system_file:s0
-
-#############################
 # System files
 #
 (/.*)?                   u:object_r:system_file:s0

apex/com.android.tzdata-file_contexts

diff --git a/apex/com.android.tzdata-file_contexts b/apex/com.android.tzdata-file_contexts
index 6ec4a0a..5aaec50 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