Snap for 4625912 from 57d49697471c96b696ec1982fce397537d99ca08 to pi-release
Change-Id: I9913378f11b132c440de3c2be4eab4fff7faa8d7
diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
index 60be156..5ac11ad 100644
--- a/squashfs-tools/mksquashfs.c
+++ b/squashfs-tools/mksquashfs.c
@@ -3282,7 +3282,7 @@
pathname, strerror(errno));
/* ANDROID CHANGES START*/
#ifdef ANDROID
- buf.st_mode = S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH; // root mode
+ buf.st_mode = S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH | S_IFDIR; // root mode
buf.st_uid = 0;
buf.st_gid = 0;
buf.st_mtime = time(NULL);
@@ -3296,6 +3296,9 @@
/* ANDROID CHANGES START*/
#ifdef ANDROID
dir_ent->capabilities = caps;
+ if (android_config) {
+ android_fs_config(fs_config_func, "", &dir_ent->inode->buf, target_out_path, &dir_ent->capabilities);
+ }
#endif
/* ANDROID CHANGES END */
