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

Commit 804de7a2 authored by Josh Gao's avatar Josh Gao
Browse files

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

This branch is still getting used to build some SDK targets.

Bug: http://b/30767018
Change-Id: I85b03a80d69ceef5e5333505f0832129387ed2da
parent e467cced

adb/Android.mk

+0 −3
Original line number Original line Diff line number Diff line
@@ -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
Original line number Original line Diff line number Diff line
@@ -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"