diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-08-26 03:02:30 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-08-26 03:02:30 +0000 |
| commit | f592d1941ec41581783ff2e48026e8e27dda647f (patch) | |
| tree | e7136c9a7e008fb6d162c694c79e86c967b37c15 | |
| parent | 027b34787019c98a67d358ad3674e53cdf59afc6 (diff) | |
| parent | a6f2586b470c96ed917ae56f2c84c6deaf8cfc31 (diff) | |
| download | e2fsprogs-f592d1941ec41581783ff2e48026e8e27dda647f.tar.gz | |
Snap for 7673994 from a6f2586b470c96ed917ae56f2c84c6deaf8cfc31 to tm-releaseandroid-vts-13.0_r8android-vts-13.0_r7android-vts-13.0_r6android-vts-13.0_r5android-vts-13.0_r4android-vts-13.0_r3android-vts-13.0_r2android-vts-13.0_r1android-t-preview-2android-t-beta-4-gplandroid-t-beta-3.2-gplandroid-t-beta-3android-security-13.0.0_r9android-security-13.0.0_r8android-security-13.0.0_r7android-security-13.0.0_r6android-security-13.0.0_r5android-security-13.0.0_r4android-security-13.0.0_r3android-security-13.0.0_r2android-security-13.0.0_r17android-security-13.0.0_r16android-security-13.0.0_r15android-security-13.0.0_r14android-security-13.0.0_r13android-security-13.0.0_r12android-security-13.0.0_r11android-security-13.0.0_r10android-security-13.0.0_r1android-platform-13.0.0_r9android-platform-13.0.0_r8android-platform-13.0.0_r7android-platform-13.0.0_r6android-platform-13.0.0_r5android-platform-13.0.0_r4android-platform-13.0.0_r3android-platform-13.0.0_r2android-platform-13.0.0_r19android-platform-13.0.0_r18android-platform-13.0.0_r17android-platform-13.0.0_r16android-platform-13.0.0_r15android-platform-13.0.0_r14android-platform-13.0.0_r13android-platform-13.0.0_r12android-platform-13.0.0_r11android-platform-13.0.0_r10android-platform-13.0.0_r1android-cts-13.0_r8android-cts-13.0_r7android-cts-13.0_r6android-cts-13.0_r5android-cts-13.0_r4android-cts-13.0_r3android-cts-13.0_r2android-cts-13.0_r1android-13.0.0_r8android-13.0.0_r7android-13.0.0_r6android-13.0.0_r5android-13.0.0_r4android-13.0.0_r31android-13.0.0_r3android-13.0.0_r2android-13.0.0_r12android-13.0.0_r1android13-tests-releaseandroid13-security-releaseandroid13-s3-releaseandroid13-s2-releaseandroid13-s1-releaseandroid13-releaseandroid13-platform-releaseandroid13-gsi
Change-Id: I90b26586b60e006a57c0116f74f7b8b58223847e
| -rw-r--r-- | contrib/android/e2fsdroid.c | 2 | ||||
| -rw-r--r-- | contrib/android/perms.c | 1 | ||||
| -rw-r--r-- | contrib/android/perms.h | 1 | ||||
| -rw-r--r-- | e2fsck/jfs_user.h | 3 |
4 files changed, 4 insertions, 3 deletions
diff --git a/contrib/android/e2fsdroid.c b/contrib/android/e2fsdroid.c index f5d24b88..6e514140 100644 --- a/contrib/android/e2fsdroid.c +++ b/contrib/android/e2fsdroid.c @@ -1,11 +1,11 @@ #define _GNU_SOURCE +#include "config.h" #include <stdio.h> #include <getopt.h> #include <string.h> #include <unistd.h> #include <limits.h> -#include <ext2fs/ext2fs.h> #include "perms.h" #include "base_fs.h" diff --git a/contrib/android/perms.c b/contrib/android/perms.c index 9c5ec05b..dd05644e 100644 --- a/contrib/android/perms.c +++ b/contrib/android/perms.c @@ -1,6 +1,7 @@ #ifndef _GNU_SOURCE # define _GNU_SOURCE //asprintf #endif +#include "config.h" #include "perms.h" #include "support/nls-enable.h" #include <time.h> diff --git a/contrib/android/perms.h b/contrib/android/perms.h index 79871272..9ea3f95c 100644 --- a/contrib/android/perms.h +++ b/contrib/android/perms.h @@ -1,7 +1,6 @@ #ifndef ANDROID_PERMS_H # define ANDROID_PERMS_H -# include "config.h" # include <ext2fs/ext2fs.h> typedef void (*fs_config_f)(const char *path, int dir, diff --git a/e2fsck/jfs_user.h b/e2fsck/jfs_user.h index 6d24558b..3b91765c 100644 --- a/e2fsck/jfs_user.h +++ b/e2fsck/jfs_user.h @@ -11,6 +11,8 @@ #ifndef _JFS_USER_H #define _JFS_USER_H +#include "config.h" + #ifdef DEBUGFS #include <stdio.h> #include <stdlib.h> @@ -27,7 +29,6 @@ /* * Pull in the definition of the e2fsck context structure */ -#include "config.h" #include "e2fsck.h" #endif |