Merge "Disable adb tests for Windows." (3f05fb5d) · Commits · e / os / android_system_core

adb/Android.mk

+6 −4

Original line number	Diff line number	Diff line
		@@ -103,6 +103,7 @@ LOCAL_STATIC_LIBRARIES := libadbd
		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
		@@ -123,6 +124,7 @@ ifeq ($(HOST_OS),darwin)
		endif

		include $(BUILD_HOST_NATIVE_TEST)
		endif

		# adb device tracker (used by ddms) test tool
		# =========================================================