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

Commit f62f1e3a authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am ef2ea99b: Merge "Correct LOCAL_LDLIBS of adb"

* commit 'ef2ea99b':
  Correct LOCAL_LDLIBS of adb
parents bab2ba3e ef2ea99b
Loading
Loading
Loading
Loading
+2 −2
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ EXTRA_SRCS :=
ifeq ($(HOST_OS),linux)
ifeq ($(HOST_OS),linux)
  USB_SRCS := usb_linux.c
  USB_SRCS := usb_linux.c
  EXTRA_SRCS := get_my_path_linux.c
  EXTRA_SRCS := get_my_path_linux.c
  LOCAL_LDLIBS += -lrt -lncurses -lpthread
  LOCAL_LDLIBS += -lrt -ldl -lpthread
endif
endif


ifeq ($(HOST_OS),darwin)
ifeq ($(HOST_OS),darwin)
@@ -139,7 +139,7 @@ include $(BUILD_EXECUTABLE)
ifneq ($(SDK_ONLY),true)
ifneq ($(SDK_ONLY),true)
include $(CLEAR_VARS)
include $(CLEAR_VARS)


LOCAL_LDLIBS := -lrt -lncurses -lpthread
LOCAL_LDLIBS := -lrt -ldl -lpthread


LOCAL_SRC_FILES := \
LOCAL_SRC_FILES := \
	adb.c \
	adb.c \