ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "DO NOT MERGE: adb: reenable (and fix) Windows build." into mnc-dev

Browse source
This commit is contained in:
TreeHugger Robot 2016-08-11 20:09:30 +00:00 • committed by Android (Google) Code Review
commit 73c59ad77c
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 # will violate ODR
LOCAL_SHARED_LIBRARIES := 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) include $(BUILD_HOST_EXECUTABLE)
endif
$(call dist-for-goals,dist_files sdk,$(LOCAL_BUILT_MODULE)) $(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 <windows.h>
#include <android-base/macros.h> #include <base/macros.h>
#include "adb.h" #include "adb.h"