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

Commit c6e404c8 authored by Josh Gao's avatar Josh Gao Committed by android-build-merger
Browse files

Merge changes from topics 'adb_thread', 'adb_loopback' am: 0301b321 am: 750dfee9 am: da1f886e 

am: 5d6593c5

Change-Id: I9f95633015ec7194b4bab54a0626ab99d90504ee
parents 2abb5f87 5d6593c5

adb/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -220,9 +220,9 @@ LOCAL_SRC_FILES_linux := $(LIBADB_TEST_linux_SRCS) 
LOCAL_SRC_FILES_darwin := $(LIBADB_TEST_darwin_SRCS)

LOCAL_SRC_FILES_windows := $(LIBADB_TEST_windows_SRCS)

LOCAL_SANITIZE := $(adb_host_sanitize)

LOCAL_SHARED_LIBRARIES := libbase

LOCAL_STATIC_LIBRARIES := \

    libadb \

    libbase \

    libcrypto_utils \

    libcrypto \

    libcutils \