diff options
| author | Luis Hector Chavez <lhchavez@google.com> | 2018-02-27 16:36:43 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-27 16:36:43 +0000 |
| commit | df21b0c9d0ea0be766565cffb3b67214ce4bb586 (patch) | |
| tree | 7645b3ab683091b8cfc123a5b75e34aac49f5aa1 | |
| parent | 9926b3d78c15d94320490d9f112045abd6fd5ed0 (diff) | |
| parent | 4c64a6a0262b74704a8a3bff3868b41801e9f3b0 (diff) | |
| download | squashfs-tools-df21b0c9d0ea0be766565cffb3b67214ce4bb586.tar.gz | |
Reland "mksquashfs: Run android_fs_config() on the root inode" am: 1cdde05cc0
am: 4c64a6a026
Change-Id: I50f1586141ac0bc47244c69b753f24a372ca2c3a
| -rw-r--r-- | squashfs-tools/mksquashfs.c | 5 |
1 files changed, 4 insertions, 1 deletions
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 @@ void dir_scan(squashfs_inode *inode, char *pathname, 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 @@ void dir_scan(squashfs_inode *inode, char *pathname, /* 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 */ |