diff options
| author | Luis Hector Chavez <lhchavez@google.com> | 2018-02-07 16:12:09 +0000 |
|---|---|---|
| committer | Luis Hector Chavez <lhchavez@google.com> | 2018-02-07 09:47:04 -0800 |
| commit | 1cdde05cc0eaa50b8bdc2377a12b49412a5c52a9 (patch) | |
| tree | 7645b3ab683091b8cfc123a5b75e34aac49f5aa1 | |
| parent | 4a7832b58029f6f0457d41699efbb03b1478d4c7 (diff) | |
| download | squashfs-tools-1cdde05cc0eaa50b8bdc2377a12b49412a5c52a9.tar.gz | |
Reland "mksquashfs: Run android_fs_config() on the root inode"android-wear-p-preview-2
This reverts commit 4a7832b58029f6f0457d41699efbb03b1478d4c7.
Reason for revert: Failures were fixed
Bug: 72745016
Test: m -j100 dist
Change-Id: I7f59370e2c000ee40a1effcc88e1681262cf8af9
| -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 */ |