openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Disable adb tests for Windows. 

The tests will need some massaging before they're ready to go for
Windows, so just disable them to unblock people trying to mm in adb.

Change-Id: I67f2cd3af1a2444dea9cbb61c0553989442ba44b
This commit is contained in:
Dan Albert 2015-05-05 14:50:09 -07:00
parent 89114c5000
commit a7a67c3079
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
adb/Android.mk
View File

@ -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_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
@ -115,14 +116,15 @@ LOCAL_STATIC_LIBRARIES := \
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
# =========================================================