| commit | aaf4fcf482d427459c70e10a22fef5ea9c7bca1a | [log] [tgz] |
|---|---|---|
| author | Dan Willemsen <dwillemsen@google.com> | Wed Sep 09 18:13:22 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Sep 09 18:13:22 2015 +0000 |
| tree | 75f9e0889d93011f9354286d0e3883b0ed49db14 | |
| parent | 4ddb6a3289d7cc1d1f60e3ae0af231da55f937ac [diff] | |
| parent | 66680c506ab67802626112e96a5ccef3ef7565c1 [diff] |
Merge "Remove HOST_OS==windows check"
diff --git a/adb/Android.mk b/adb/Android.mk index 9600133..b34a49f 100644 --- a/adb/Android.mk +++ b/adb/Android.mk
@@ -118,9 +118,7 @@ LOCAL_STATIC_LIBRARIES := libcrypto_static libbase LOCAL_C_INCLUDES_windows := development/host/windows/usb/api/ -ifneq ($(HOST_OS),windows) - LOCAL_MULTILIB := 64 -endif +LOCAL_MULTILIB := first include $(BUILD_HOST_STATIC_LIBRARY)