Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eba1d833 authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

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

am: 86698112

Change-Id: I1ebbd9a008f5d0cd0812d85802888a952ea77a1b
parents 8ff4dbe4 86698112

adb/Android.mk

+4 −4
Original line number Diff line number Diff line
@@ -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