diff options
| author | Steven Moreland <smoreland@google.com> | 2018-02-15 20:46:29 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-15 20:46:29 +0000 |
| commit | bf31998832a522e092786a6c643351ac724159cf (patch) | |
| tree | a066d5356fbb09e590ac9c70d3f0398ba9a4d8fa | |
| parent | 8de2e80257648efdec312082cfd5455f01e5683c (diff) | |
| parent | 8660e822f5fb453a82b1a7eecdbde6cc5a4454f7 (diff) | |
| download | android_external_e2fsprogs-bf31998832a522e092786a6c643351ac724159cf.tar.gz android_external_e2fsprogs-bf31998832a522e092786a6c643351ac724159cf.tar.bz2 android_external_e2fsprogs-bf31998832a522e092786a6c643351ac724159cf.zip | |
Merge "mke2fs: Don't require mke2fs.conf on Windows." am: 24ff14fcd1 am: d471428695
am: 8660e822f5
Change-Id: Id9fa451774843f4f8d6cfa960c2ec21cee31e210
| -rw-r--r-- | misc/Android.bp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/misc/Android.bp b/misc/Android.bp index 0305fc08..e73150f8 100644 --- a/misc/Android.bp +++ b/misc/Android.bp @@ -41,9 +41,6 @@ cc_binary { "mk_hugefiles.c", "default_profile.c", ], - required: [ - "mke2fs.conf", - ], cflags: [ "-Wno-error=format", "-Wno-error=type-limits", @@ -64,6 +61,11 @@ cc_binary { "libz", ], }, + not_windows: { + required: [ + "mke2fs.conf", + ], + }, windows: { include_dirs: [ "external/e2fsprogs/include/mingw" ], cflags: [ @@ -79,6 +81,9 @@ cc_binary { enabled: true }, android: { + required: [ + "mke2fs.conf", + ], shared_libs: [ "libext2fs", "libext2_blkid", @@ -88,7 +93,7 @@ cc_binary { "libext2_com_err", "libext2_e2p", ], - symlinks: ["mkfs.ext2", "mkfs.ext3", "mkfs.ext4"], + symlinks: ["mkfs.ext2", "mkfs.ext3", "mkfs.ext4"], }, }, stl: "libc++_static", |