diff options
| author | Dan Albert <danalbert@google.com> | 2015-03-16 10:08:46 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2015-03-16 10:08:46 -0700 |
| commit | c007bc3856a4cf86b8f610eb045f26a9dedc2894 (patch) | |
| tree | 1b38faec0f6c58070f020edcb6a886f1d71cd5bd /adb/Android.mk | |
| parent | b750efcc302f2cb50abe1eb20dc92414636cb5d2 (diff) | |
| download | system_core-c007bc3856a4cf86b8f610eb045f26a9dedc2894.tar.gz system_core-c007bc3856a4cf86b8f610eb045f26a9dedc2894.tar.bz2 system_core-c007bc3856a4cf86b8f610eb045f26a9dedc2894.zip | |
Revert "Revert "Create libbase.""
This reverts commit a7870d88167f619e758b5bcd15b410d16da7c16b.
Diffstat (limited to 'adb/Android.mk')
| -rw-r--r-- | adb/Android.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/adb/Android.mk b/adb/Android.mk index 817161183..7cfbcb9ff 100644 --- a/adb/Android.mk +++ b/adb/Android.mk @@ -90,7 +90,7 @@ LOCAL_MODULE := adbd_test LOCAL_CFLAGS := -DADB_HOST=0 $(LIBADB_CFLAGS) LOCAL_SRC_FILES := $(LIBADB_TEST_SRCS) LOCAL_STATIC_LIBRARIES := libadbd -LOCAL_SHARED_LIBRARIES := liblog libcutils libutils +LOCAL_SHARED_LIBRARIES := liblog libbase libcutils include $(BUILD_NATIVE_TEST) include $(CLEAR_VARS) @@ -98,12 +98,11 @@ LOCAL_CLANG := $(ADB_CLANG) LOCAL_MODULE := adb_test LOCAL_CFLAGS := -DADB_HOST=1 $(LIBADB_CFLAGS) LOCAL_SRC_FILES := $(LIBADB_TEST_SRCS) services.cpp -LOCAL_SHARED_LIBRARIES := liblog +LOCAL_SHARED_LIBRARIES := liblog libbase LOCAL_STATIC_LIBRARIES := \ libadb \ libcrypto_static \ libcutils \ - libutils \ ifeq ($(HOST_OS),linux) LOCAL_LDLIBS += -lrt -ldl -lpthread |