Merge "Don't build 32-bit host libadb."

2015-08-26 02:38:51 +00:00 · 2015-08-26 02:38:51 +00:00 · 0ac29519ac
parent e2cda95341 daa6c463a9
commit 0ac29519ac
1 changed files with 2 additions and 0 deletions
--- a/adb/Android.mk
+++ b/adb/Android.mk
@ -118,6 +118,8 @@ LOCAL_STATIC_LIBRARIES := libcrypto_static libbase

 ifeq ($(HOST_OS),windows)
    LOCAL_C_INCLUDES += development/host/windows/usb/api/
+else
+    LOCAL_MULTILIB := 64
 endif

 include $(BUILD_HOST_STATIC_LIBRARY)