resolved conflicts for merge of f62f1e3a to master (2c43b558) · Commits · e / os / android_system_core

adb/Android.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -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 \