Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Snippets Groups Projects
Commit 73c59ad7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 8b6b654a 804de7a2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
adb/Android.mk
+ 0
− 3
View file @ 73c59ad7
...@@ -200,10 +200,7 @@ endif ...@@ -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))
......
adb/sysdeps/mutex.h
+ 1
− 1
View file @ 73c59ad7
...@@ -20,7 +20,7 @@ ...@@ -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"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment