commit ffd89e6c6b3cfd53a7ca7a6674eaebc90acc2544
author Josh Gao <jmgao@google.com> Tue Aug 09 13:43:03 2016 -0700
committer Josh Gao <jmgao@google.com> Thu Aug 11 11:29:43 2016 -0700
tree 3f03ab94c7e335b7910c7ac8302851ddf3cf2ea1
parent c187fe96908ac4e30090aa2e53547d786bda227f

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

diff --git a/adb/Android.mk b/adb/Android.mk
index d4adbfb..425bf9b 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -200,10 +200,7 @@
 # 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))
 

adb/sysdeps/mutex.h

diff --git a/adb/sysdeps/mutex.h b/adb/sysdeps/mutex.h
index ef5d9b1..e33551f 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"