ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
am: 86698112b9

Change-Id: I1ebbd9a008f5d0cd0812d85802888a952ea77a1b
This commit is contained in:
Elliott Hughes 2017-05-10 18:36:43 +00:00 • committed by android-build-merger
commit eba1d8338f
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
adb/Android.mk
View file

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