diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-02-04 04:07:09 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-02-04 04:07:09 +0000 |
| commit | a4ebb16ac74a944cae8050e1f4cd00beb3a1ca8b (patch) | |
| tree | 92bf4d5791f90a38f7959f1e461c2012531f6c49 | |
| parent | 7b3a8c054c5cf6946dfde9fc627add152d74d50b (diff) | |
| parent | 688da8307d3c6917fd602125c2d640f76b1ee2d7 (diff) | |
| download | e2fsprogs-a4ebb16ac74a944cae8050e1f4cd00beb3a1ca8b.tar.gz | |
Snap for 9562441 from 688da8307d3c6917fd602125c2d640f76b1ee2d7 to udc-release
Change-Id: I0b2aabb4912b4accb7c35793cfd3ba26d853d103
| -rw-r--r-- | Android.bp | 4 | ||||
| -rw-r--r-- | lib/config.h | 3 | ||||
| -rw-r--r-- | lib/ext2fs/ext2_err.c | 2 | ||||
| -rw-r--r-- | util/android_config.h | 3 |
4 files changed, 11 insertions, 1 deletions
@@ -62,6 +62,10 @@ cc_defaults { "libdl", ], }, + darwin: { + // Still has unfixed/unsuppressed warnings. + cflags: ["-Wno-error"], + }, windows: { include_dirs: ["external/e2fsprogs/include/mingw"], }, diff --git a/lib/config.h b/lib/config.h index 90b8f8a8..c2288602 100644 --- a/lib/config.h +++ b/lib/config.h @@ -54,6 +54,9 @@ # define HAVE_SYS_SELECT_H 1 # define HAVE_SYS_WAIT_H 1 #endif +#ifdef __APPLE__ +# define HAVE_GETMNTINFO 1 +#endif #if defined(__linux__) # define HAVE_EXT2_IOCTLS 1 # define HAVE_FALLOCATE 1 diff --git a/lib/ext2fs/ext2_err.c b/lib/ext2fs/ext2_err.c index b03640f1..ebfd5006 100644 --- a/lib/ext2fs/ext2_err.c +++ b/lib/ext2fs/ext2_err.c @@ -8,7 +8,7 @@ #define N_(a) a static const char * const text[] = { - N_( "EXT2FS Library version android-t-qpr1-beta-2-gpl-317-gf5bb4815"), + N_( "EXT2FS Library version android-t-qpr1-beta-2-gpl-322-gbb6d46cc"), N_( "Wrong magic number for ext2_filsys structure"), N_( "Wrong magic number for badblocks_list structure"), N_( "Wrong magic number for badblocks_iterate structure"), diff --git a/util/android_config.h b/util/android_config.h index 90b8f8a8..c2288602 100644 --- a/util/android_config.h +++ b/util/android_config.h @@ -54,6 +54,9 @@ # define HAVE_SYS_SELECT_H 1 # define HAVE_SYS_WAIT_H 1 #endif +#ifdef __APPLE__ +# define HAVE_GETMNTINFO 1 +#endif #if defined(__linux__) # define HAVE_EXT2_IOCTLS 1 # define HAVE_FALLOCATE 1 |