commit 2b296bf6c61bdb592c83af7e08edc34dc8c7b8a2
author Dan Albert <danalbert@google.com> Wed May 06 22:55:39 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed May 06 22:55:39 2015 +0000
tree 0e53327bf7a8ae659ee3da5ecfba3769877a9471
parent d05b41ba58d2fedc7df573041a930ebe44ee2b09
parent 2bb177f57049d41e3ffa7b605c09e802c379f4e2

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

* commit 'a81df1cb0f0ed14aab75e1418fc1df3a3634b688':
  Disable adb tests for Windows.

adb/Android.mk

diff --git a/adb/Android.mk b/adb/Android.mk
index 1613a88..7d6238c 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
 
 adb_version := $(shell git -C $(LOCAL_PATH) rev-parse --short=12 HEAD 2>/dev/null)-android
@@ -109,6 +109,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
@@ -121,14 +122,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
 # =========================================================