| commit | 05ba96a10207f096ca732dc2e21f98351b2ffdf3 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Aug 26 03:47:48 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 26 03:47:48 2015 +0000 |
| tree | df40bf7c3dfb9568d56407291c0ca2531608c126 | |
| parent | f236bd086f0a89adc09492a7f9fcaedfe8d91517 [diff] | |
| parent | a84f0766e4ec1f2759b91b090a828b63279eb310 [diff] |
am b6ae989a: am 0ac29519: Merge "Don\'t build 32-bit host libadb." * commit 'b6ae989acf9958632ce91d2f06fd185aeb9fd0d3': 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)