| commit | a84f0766e4ec1f2759b91b090a828b63279eb310 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Aug 26 02:44:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 26 02:44:34 2015 +0000 |
| tree | c3091bc730ce96ae26ef40c0d7f577133b075918 | |
| parent | 907ff217e3ffcedf5edc40ea16dae9b735e920f8 [diff] | |
| parent | db24c3872245498c3333865d6f124c697cf71486 [diff] |
am 0ac29519: Merge "Don\'t build 32-bit host libadb." * commit '0ac29519ac75a72a4ecacffc819eff9adf5b1b70': Don't build 32-bit host libadb.
diff --git a/adb/Android.mk b/adb/Android.mk index e271a63..df0c7a1 100644 --- a/adb/Android.mk +++ b/adb/Android.mk
@@ -118,6 +118,8 @@ ifeq ($(HOST_OS),windows) LOCAL_C_INCLUDES += development/host/windows/usb/api/ +else + LOCAL_MULTILIB := 64 endif include $(BUILD_HOST_STATIC_LIBRARY)