commit b74e766f177ffd79aea3bb33b1cd5fb26d4e060e
author android-build-team Robot <android-build-team-robot@google.com> Wed Oct 02 03:08:00 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Oct 02 03:08:00 2019 +0000
tree f96c2738a640a402fde75a0f26028d10c9f2c1b7
parent 22f01156156f73316057abd396932dd9a578a090
parent fa39cf5d4bbc43e955fbb4646360e4a6744649c8

Snap for 5912542 from fa39cf5d4bbc43e955fbb4646360e4a6744649c8 to rvc-release

Change-Id: I6c30340f9a114e3fad19c1cc602a4526ccaf5b6b

libselinux/src/android/android.c

diff --git a/libselinux/src/android/android.c b/libselinux/src/android/android.c
index 4ae5da6..2e70ceb 100644
--- a/libselinux/src/android/android.c
+++ b/libselinux/src/android/android.c
@@ -2,7 +2,7 @@
 
 // For 'system', 'system_ext' (optional), 'product' (optional), 'vendor' (mandatory)
 // and/or 'odm' (optional).
-#define MAX_FILE_CONTEXT_SIZE 4
+#define MAX_FILE_CONTEXT_SIZE 5
 
 #ifdef __ANDROID_VNDK__
 #ifndef LOG_EVENT_STRING

libselinux/src/android/android_platform.c

diff --git a/libselinux/src/android/android_platform.c b/libselinux/src/android/android_platform.c
index 42ee468..1b807aa 100644
--- a/libselinux/src/android/android_platform.c
+++ b/libselinux/src/android/android_platform.c
@@ -3,7 +3,7 @@
 
 // For 'system', 'system_ext' (optional), 'product' (optional), 'vendor' (mandatory)
 // and/or 'odm' (optional).
-#define MAX_FILE_CONTEXT_SIZE 4
+#define MAX_FILE_CONTEXT_SIZE 5
 
 static const char *const sepolicy_file = "/sepolicy";