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

Commit 09b5b49e authored by Josh Gao's avatar Josh Gao Committed by android-build-merger
Browse files

DO NOT MERGE: adb: reenable (and fix) Windows build. am: 804de7a2 am: 5c4bf3d6 

am: 5cee87ea

Change-Id: I76cecf9ef71ce9f631130868d402125b1e6ba9e3
parents 647ec18a 5cee87ea

adb/Android.mk

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

adb/sysdeps/mutex.h

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 


#include <windows.h>



#include <android-base/macros.h>

#include <base/macros.h>



#include "adb.h"