diff options
| author | Steven Moreland <smoreland@google.com> | 2018-02-12 15:18:03 -0800 |
|---|---|---|
| committer | Steven Moreland <smoreland@google.com> | 2018-02-14 18:12:35 -0800 |
| commit | dd086f6cfbec49e47ae407d9cbbbc374edd2925b (patch) | |
| tree | 4cc3f47905e5c404aff5cb74dd6440e006811204 | |
| parent | c4d54206dac88555e7547246d045650d38987b84 (diff) | |
| download | e2fsprogs-dd086f6cfbec49e47ae407d9cbbbc374edd2925b.tar.gz | |
mke2fs: Don't require mke2fs.conf on Windows.
This target doesn't exist on Windows.
Fixes the following error:
build/make/core/main.mk:586: warning: Missing required dependency host_cross_mke2fs.conf from module host_cross_mke2fs defined in out/soong/Android-aosp_walleye.mk
Bug: 7456955
Test: above error no longer present
Change-Id: I278e53488ecfc4f9d5e540a70276344af06ad455
| -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", |