diff options
| author | Ying Wang <wangying@google.com> | 2013-01-10 15:35:05 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2013-01-10 15:35:05 -0800 |
| commit | 2c43b55814c9038f25425dd0a9b202e4fb9b5229 (patch) | |
| tree | 0a325915e117d35bb897609aa43fe5d8a338270b /adb/Android.mk | |
| parent | 7f213f878dea1825dba7db80967ea996364043e4 (diff) | |
| parent | f62f1e3a07d037bc50420575b028269cc7f7ede4 (diff) | |
| download | system_core-2c43b55814c9038f25425dd0a9b202e4fb9b5229.zip system_core-2c43b55814c9038f25425dd0a9b202e4fb9b5229.tar.gz system_core-2c43b55814c9038f25425dd0a9b202e4fb9b5229.tar.bz2 | |
resolved conflicts for merge of f62f1e3a to master
Change-Id: I35c66859e2c454c20c8acc6b2b1f0833032205bb
Diffstat (limited to 'adb/Android.mk')
| -rw-r--r-- | adb/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/adb/Android.mk b/adb/Android.mk index 1fca684..a803978 100644 --- a/adb/Android.mk +++ b/adb/Android.mk @@ -16,7 +16,7 @@ EXTRA_SRCS := ifeq ($(HOST_OS),linux) USB_SRCS := usb_linux.c EXTRA_SRCS := get_my_path_linux.c - LOCAL_LDLIBS += -lrt -lncurses -lpthread + LOCAL_LDLIBS += -lrt -ldl -lpthread LOCAL_CFLAGS += -DWORKAROUND_BUG6558362 endif @@ -141,7 +141,7 @@ include $(BUILD_EXECUTABLE) ifneq ($(SDK_ONLY),true) include $(CLEAR_VARS) -LOCAL_LDLIBS := -lrt -lncurses -lpthread +LOCAL_LDLIBS := -lrt -ldl -lpthread LOCAL_SRC_FILES := \ adb.c \ |