From 676799f23d935b64873ccf5b1bf9b475cb392ea3 Mon Sep 17 00:00:00 2001
From: Christopher Wiley <wiley@google.com>
Date: Wed, 30 Dec 2015 12:24:40 -0800
Subject: [PATCH] Fix compiler warnings on Windows in CopyFile.c

direct.h declares _mkdir() on Windows.

Prevent future compiler warnings with -Wall and -Werror.

Bug: 26355209
Test: `mmma -j30 build/libs/host` for aosp_arm64-eng is successful.

Change-Id: I6d6e4edca98bef57d62829e9d1ef4e2a96cdad3d
---
 libs/host/Android.mk | 1 +
 libs/host/CopyFile.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/libs/host/Android.mk b/libs/host/Android.mk
index 7eb3aa14d..8a28457d3 100644
--- a/libs/host/Android.mk
+++ b/libs/host/Android.mk
@@ -4,6 +4,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES:= \
     CopyFile.c
 
+LOCAL_CFLAGS := -Werror -Wall
 LOCAL_CFLAGS_darwin += -DMACOSX_RSRC
 
 LOCAL_MODULE:= libhost
diff --git a/libs/host/CopyFile.c b/libs/host/CopyFile.c
index 1d9b6bd8e..d785dca83 100644
--- a/libs/host/CopyFile.c
+++ b/libs/host/CopyFile.c
@@ -25,6 +25,7 @@
 #include <assert.h>
 
 #if defined(_WIN32)
+#include <direct.h>  /* For _mkdir() */
 #  define mkdir(path,mode)   _mkdir(path)
 #  define S_ISLNK(s) 0
 #  define lstat stat
-- 
2.11.0