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

DO NOT MERGE: adb: reenable (and fix) Windows build. 

am: 804de7a29e

Change-Id: I4dc4d5cb64c4757894fbdff1b3e12426aa965aa7
This commit is contained in:
Josh Gao 2016-08-11 20:19:09 +00:00 committed by android-build-merger
parent fe59793375 804de7a29e
commit 5c4bf3d66f
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
adb/Android.mk
View File

@ -200,10 +200,7 @@ endif
# 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))

2
adb/sysdeps/mutex.h
View File

@ -20,7 +20,7 @@
#include <windows.h>
#include <android-base/macros.h>
#include <base/macros.h>
#include "adb.h"