am b6ae989a: am 0ac29519: Merge "Don\'t build 32-bit host libadb."

* commit 'b6ae989acf9958632ce91d2f06fd185aeb9fd0d3': Don't build 32-bit host libadb.
2015-08-26 02:49:20 +00:00 · 2015-08-26 02:49:20 +00:00 · 8303f54a58
parent 12e519cc39 b6ae989acf
commit 8303f54a58
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)