From 25a03337db1617c5d2cfe7c6d8f92b8b90131f8a Mon Sep 17 00:00:00 2001
From: Steven Moreland <smoreland@google.com>
Date: Mon, 12 Feb 2018 15:18:03 -0800
Subject: [PATCH] AOSP: 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
From AOSP commit: dd086f6cfbec49e47ae407d9cbbbc374edd2925b
---
 misc/Android.bp | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/misc/Android.bp b/misc/Android.bp
index b3cb79033..8db9ba6fe 100644
--- a/misc/Android.bp
+++ b/misc/Android.bp
@@ -39,10 +39,11 @@ cc_binary {
         "mk_hugefiles.c",
         "default_profile.c",
     ],
-    required: [
-        "mke2fs.conf",
+    cflags: [
+        "-Wno-error=format",
+        "-Wno-error=type-limits",
+        "-Wno-format-extra-args",
     ],
-    cflags: ["-W", "-Wall", "-Wno-macro-redefined"],
     target: {
         host: {
             static_libs: [
@@ -58,6 +59,11 @@ cc_binary {
                 "libz",
             ],
         },
+        not_windows: {
+            required: [
+                "mke2fs.conf",
+            ],
+        },
         windows: {
             include_dirs: [ "external/e2fsprogs/include/mingw" ],
             cflags: ["-D_POSIX", "-D__USE_MINGW_ALARM"],
@@ -66,6 +72,9 @@ cc_binary {
             enabled: true
         },
         android: {
+            required: [
+                "mke2fs.conf",
+            ],
             shared_libs: [
                 "libext2fs",
                 "libext2_blkid",
@@ -75,7 +84,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",
-- 
2.39.2