commit 2bb177f57049d41e3ffa7b605c09e802c379f4e2
author Dan Albert <danalbert@google.com> Tue May 05 22:17:56 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue May 05 22:17:56 2015 +0000
tree 9b22ecd854eb794c13cab9991e7c778d4fa8ba82
parent d04c43682c08b2fba0b84932b33a760ecfa005da
parent 24764ecf6ce2c8162c9a09410391b598f665f146

am 3f05fb5d: Merge "Disable adb tests for Windows."

* commit '3f05fb5d97d27f55adfb09febbc1957e893f0f8e':
  Disable adb tests for Windows.

adb/Android.mk

diff --git a/adb/Android.mk b/adb/Android.mk
index dd1343b..e091ba8 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -6,9 +6,9 @@
 LOCAL_PATH:= $(call my-dir)
 
 ifeq ($(HOST_OS),windows)
-  adb_host_clang := false  # libc++ for mingw not ready yet.
+    adb_host_clang := false  # libc++ for mingw not ready yet.
 else
-  adb_host_clang := true
+    adb_host_clang := true
 endif
 
 # libadb
@@ -103,6 +103,7 @@
 LOCAL_SHARED_LIBRARIES := liblog libbase libcutils
 include $(BUILD_NATIVE_TEST)
 
+ifneq ($(HOST_OS),windows)
 include $(CLEAR_VARS)
 LOCAL_CLANG := $(adb_host_clang)
 LOCAL_MODULE := adb_test
@@ -115,14 +116,15 @@
     libcutils \
 
 ifeq ($(HOST_OS),linux)
-  LOCAL_LDLIBS += -lrt -ldl -lpthread
+    LOCAL_LDLIBS += -lrt -ldl -lpthread
 endif
 
 ifeq ($(HOST_OS),darwin)
-  LOCAL_LDLIBS += -framework CoreFoundation -framework IOKit
+    LOCAL_LDLIBS += -framework CoreFoundation -framework IOKit
 endif
 
 include $(BUILD_HOST_NATIVE_TEST)
+endif
 
 # adb device tracker (used by ddms) test tool
 # =========================================================