commit c05fa1a5cfcea7fecc9b6428a37e9d9f9e78a3ae
author Xin Li <delphij@google.com> Tue Aug 07 09:46:55 2018 -0700
committer Xin Li <delphij@google.com> Tue Aug 07 09:46:55 2018 -0700
tree 894461bc43c47b22e68e8ed567a38677f391c195
parent 08602532391553f2f1383ab8d474b1b65cc9b274
parent ca8749a0b3b9ed0c67b3caec85e61024df38ee7f

Merge Android Pie into master

Bug: 112104996
Change-Id: Icf411d8b04e12dd33dd82a26328b4156585cb5ff

private/file_contexts

diff --git a/private/file_contexts b/private/file_contexts
index 8f5241b..2087a36 100644
--- a/private/file_contexts
+++ b/private/file_contexts
@@ -16,6 +16,7 @@
 # Executables
 /charger            u:object_r:rootfs:s0
 /init               u:object_r:init_exec:s0
+/system/bin/init    u:object_r:init_exec:s0
 /sbin(/.*)?         u:object_r:rootfs:s0
 
 # For kernel modules

private/fs_use

diff --git a/private/fs_use b/private/fs_use
index 4bd1112..d351c36 100644
--- a/private/fs_use
+++ b/private/fs_use
@@ -8,6 +8,7 @@
 fs_use_xattr btrfs u:object_r:labeledfs:s0;
 fs_use_xattr f2fs u:object_r:labeledfs:s0;
 fs_use_xattr squashfs u:object_r:labeledfs:s0;
+fs_use_xattr erofs u:object_r:labeledfs:s0;
 
 # Label inodes from task label.
 fs_use_task pipefs u:object_r:pipefs:s0;