Merge "Fix style nits in adb's Android.mk." am: 30b7f59efc am: 86698112b9 am: eba1d8338f

am: 94ed60471d

Change-Id: Idb4e5a160bbab50919e5a1b053a0d0f43fce8e28
This commit is contained in:
Elliott Hughes 2017-05-10 23:38:06 +00:00 committed by android-build-merger
commit cf4289550c

View file

@ -15,11 +15,11 @@ ADB_COMMON_CFLAGS := \
-Wno-unused-parameter \
-Wno-missing-field-initializers \
-Wvla \
-DADB_VERSION="\"$(tool_version)\""
-DADB_VERSION="\"$(tool_version)\"" \
ADB_COMMON_posix_CFLAGS := \
-Wexit-time-destructors \
-Wthread-safety
-Wthread-safety \
ADB_COMMON_linux_CFLAGS := \
$(ADB_COMMON_posix_CFLAGS) \
@ -232,7 +232,7 @@ LOCAL_STATIC_LIBRARIES := \
libcutils \
libdiagnose_usb \
libmdnssd \
libgmock_host
libgmock_host \
LOCAL_STATIC_LIBRARIES_linux := libusb
LOCAL_STATIC_LIBRARIES_darwin := libusb
@ -300,7 +300,7 @@ LOCAL_STATIC_LIBRARIES := \
libcrypto \
libdiagnose_usb \
liblog \
libmdnssd
libmdnssd \
# Don't use libcutils on Windows.
LOCAL_STATIC_LIBRARIES_darwin := libcutils