diff options
author | Luis Hector Chavez <lhchavez@google.com> | 2018-02-27 16:41:53 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-02-27 16:41:53 +0000 |
commit | 57d49697471c96b696ec1982fce397537d99ca08 (patch) | |
tree | 7645b3ab683091b8cfc123a5b75e34aac49f5aa1 | |
parent | fc898fd4922ccd539da063f678388aa435f9257d (diff) | |
parent | df21b0c9d0ea0be766565cffb3b67214ce4bb586 (diff) | |
download | squashfs-tools-57d49697471c96b696ec1982fce397537d99ca08.tar.gz |
Reland "mksquashfs: Run android_fs_config() on the root inode" am: 1cdde05cc0 am: 4c64a6a026android-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-p-preview-3android-p-preview-2android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-dev
am: df21b0c9d0
Change-Id: Icbc0d2639d8278b53c2cbc793d9064d57352bd09
-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 */ |