diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-02-18 08:20:46 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-02-18 08:20:46 +0000 |
| commit | ca21ef5b9f5069a3e0a5ecc9f6a88aa2156d2778 (patch) | |
| tree | 744730164b0b53f01eef15d58afd74c7ef7cec0c | |
| parent | d486f046d09ce16e9cf017d3966e2119862613af (diff) | |
| parent | df7ac4ef2465ecb0e4ba60143636b644b3752ae0 (diff) | |
| download | e2fsprogs-ca21ef5b9f5069a3e0a5ecc9f6a88aa2156d2778.tar.gz | |
Snap for 4610834 from df7ac4ef2465ecb0e4ba60143636b644b3752ae0 to pi-release
Change-Id: I4d82ad0c72de1da8691374bfe8ff850c2c32c004
| -rw-r--r-- | OWNERS | 2 | ||||
| -rw-r--r-- | misc/Android.bp | 13 |
2 files changed, 9 insertions, 6 deletions
@@ -1,3 +1 @@ -adriens@google.com -jinqian@google.com tytso@google.com 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", |