From 804de7a29efbcb759ba9f01123957b7dd839dda2 Mon Sep 17 00:00:00 2001
From: Josh Gao <jmgao@google.com>
Date: Tue, 9 Aug 2016 13:43:03 -0700
Subject: [PATCH] DO NOT MERGE: adb: reenable (and fix) Windows build.

This branch is still getting used to build some SDK targets.

Bug: http://b/30767018
Change-Id: I85b03a80d69ceef5e5333505f0832129387ed2da
---
 adb/Android.mk      | 3 ---
 adb/sysdeps/mutex.h | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/adb/Android.mk b/adb/Android.mk
index d4adbfb6a..425bf9ba5 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -200,10 +200,7 @@ endif
 # will violate ODR
 LOCAL_SHARED_LIBRARIES :=
 
-# Don't build the host adb on Windows (this branch should only be used for security updates.)
-ifneq ($(HOST_OS),windows)
 include $(BUILD_HOST_EXECUTABLE)
-endif
 
 $(call dist-for-goals,dist_files sdk,$(LOCAL_BUILT_MODULE))
 
diff --git a/adb/sysdeps/mutex.h b/adb/sysdeps/mutex.h
index ef5d9b164..e33551fe1 100644
--- a/adb/sysdeps/mutex.h
+++ b/adb/sysdeps/mutex.h
@@ -20,7 +20,7 @@
 
 #include <windows.h>
 
-#include <android-base/macros.h>
+#include <base/macros.h>
 
 #include "adb.h"