commit e94b487ecd560c5be49868657381a81c3590b743
author android-build-team Robot <android-build-team-robot@google.com> Sat Apr 06 23:15:13 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sat Apr 06 23:15:13 2019 +0000
tree b45e839df31d046e0f9262db2f799f9f633b4b2c
parent 0eace0c5690aede41fdde066ee07aebedca49f1b
parent 4a792614521f82ffa73448483071925a2b77315b

Snap for 5443223 from 4a792614521f82ffa73448483071925a2b77315b to qt-release

Change-Id: Ic4ee366a9f3af1c890ec0e38cc2df8a1f5935228

libselinux/include/selinux/android.h

diff --git a/libselinux/include/selinux/android.h b/libselinux/include/selinux/android.h
index 556cbbe..99fc9ef 100644
--- a/libselinux/include/selinux/android.h
+++ b/libselinux/include/selinux/android.h
@@ -53,6 +53,7 @@
 #define SELINUX_ANDROID_RESTORECON_DATADATA 16
 #define SELINUX_ANDROID_RESTORECON_SKIPCE   32
 #define SELINUX_ANDROID_RESTORECON_CROSS_FILESYSTEMS   64
+#define SELINUX_ANDROID_RESTORECON_SKIP_SEHASH         128
 extern int selinux_android_restorecon(const char *file, unsigned int flags);
 
 extern int selinux_android_restorecon_pkgdir(const char *pkgdir,

libselinux/src/android/android_platform.c

diff --git a/libselinux/src/android/android_platform.c b/libselinux/src/android/android_platform.c
index 555b2b0..c0e6044 100644
--- a/libselinux/src/android/android_platform.c
+++ b/libselinux/src/android/android_platform.c
@@ -1569,8 +1569,8 @@
     bool datadata = (flags & SELINUX_ANDROID_RESTORECON_DATADATA) ? true : false;
     bool skipce = (flags & SELINUX_ANDROID_RESTORECON_SKIPCE) ? true : false;
     bool cross_filesystems = (flags & SELINUX_ANDROID_RESTORECON_CROSS_FILESYSTEMS) ? true : false;
+    bool setrestoreconlast = (flags & SELINUX_ANDROID_RESTORECON_SKIP_SEHASH) ? false : true;
     bool issys;
-    bool setrestoreconlast = true;
     struct stat sb;
     struct statfs sfsb;
     FTS *fts;