diff options
| -rw-r--r-- | adb/Android.mk | 2 | ||||
| -rwxr-xr-x | libbacktrace/Android.mk | 4 | ||||
| -rw-r--r-- | libcutils/Android.mk | 2 | ||||
| -rw-r--r-- | liblog/Android.mk | 8 | ||||
| -rw-r--r-- | liblog/tests/Android.mk | 1 | ||||
| -rw-r--r-- | libutils/Android.mk | 8 | ||||
| -rw-r--r-- | logcat/tests/Android.mk | 1 |
7 files changed, 1 insertions, 25 deletions
diff --git a/adb/Android.mk b/adb/Android.mk index 62f012cb1..51e1664e9 100644 --- a/adb/Android.mk +++ b/adb/Android.mk @@ -138,8 +138,6 @@ include $(BUILD_EXECUTABLE) ifneq ($(SDK_ONLY),true) include $(CLEAR_VARS) -LOCAL_LDLIBS := -lrt -ldl -lpthread - LOCAL_SRC_FILES := \ adb.c \ console.c \ diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk index a7305da22..7fe52ef73 100755 --- a/libbacktrace/Android.mk +++ b/libbacktrace/Android.mk @@ -105,10 +105,8 @@ backtrace_test_src_files := \ GetPss.cpp \ thread_utils.c \ -backtrace_test_ldlibs := \ - -lpthread \ - backtrace_test_ldlibs_host := \ + -lpthread \ -lrt \ backtrace_test_shared_libraries := \ diff --git a/libcutils/Android.mk b/libcutils/Android.mk index 2dcc965de..945ebdd7f 100644 --- a/libcutils/Android.mk +++ b/libcutils/Android.mk @@ -75,7 +75,6 @@ endif # ======================================================== LOCAL_MODULE := libcutils LOCAL_SRC_FILES := $(commonSources) $(commonHostSources) dlmalloc_stubs.c -LOCAL_LDLIBS := -lpthread LOCAL_STATIC_LIBRARIES := liblog LOCAL_CFLAGS += $(hostSmpFlag) ifneq ($(HOST_OS),windows) @@ -89,7 +88,6 @@ include $(BUILD_HOST_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := lib64cutils LOCAL_SRC_FILES := $(commonSources) $(commonHostSources) dlmalloc_stubs.c -LOCAL_LDLIBS := -lpthread LOCAL_STATIC_LIBRARIES := lib64log LOCAL_CFLAGS += $(hostSmpFlag) -m64 ifneq ($(HOST_OS),windows) diff --git a/liblog/Android.mk b/liblog/Android.mk index 5e0190307..41440ad97 100644 --- a/liblog/Android.mk +++ b/liblog/Android.mk @@ -57,10 +57,6 @@ endif # ======================================================== LOCAL_MODULE := liblog LOCAL_SRC_FILES := $(liblog_host_sources) -LOCAL_LDLIBS := -lpthread -ifeq ($(strip $(HOST_OS)),linux) -LOCAL_LDLIBS += -lrt -endif LOCAL_CFLAGS := -DFAKE_LOG_DEVICE=1 include $(BUILD_HOST_STATIC_LIBRARY) @@ -78,10 +74,6 @@ include $(BUILD_HOST_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := lib64log LOCAL_SRC_FILES := $(liblog_host_sources) -LOCAL_LDLIBS := -lpthread -ifeq ($(strip $(HOST_OS)),linux) -LOCAL_LDLIBS += -lrt -endif LOCAL_CFLAGS := -DFAKE_LOG_DEVICE=1 -m64 include $(BUILD_HOST_STATIC_LIBRARY) diff --git a/liblog/tests/Android.mk b/liblog/tests/Android.mk index d1d911538..255dc2eb3 100644 --- a/liblog/tests/Android.mk +++ b/liblog/tests/Android.mk @@ -83,7 +83,6 @@ LOCAL_MODULE := $(test_module_prefix)unit-tests LOCAL_MODULE_TAGS := $(test_tags) LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_CFLAGS += $(test_c_flags) -LOCAL_LDLIBS := -lpthread LOCAL_SHARED_LIBRARIES := liblog LOCAL_SRC_FILES := $(test_src_files) include $(BUILD_NATIVE_TEST) diff --git a/libutils/Android.mk b/libutils/Android.mk index 1710d3671..1c4861902 100644 --- a/libutils/Android.mk +++ b/libutils/Android.mk @@ -69,7 +69,6 @@ endif LOCAL_MODULE:= libutils LOCAL_STATIC_LIBRARIES := liblog LOCAL_CFLAGS += $(host_commonCflags) -LOCAL_LDLIBS += $(host_commonLdlibs) include $(BUILD_HOST_STATIC_LIBRARY) @@ -83,7 +82,6 @@ endif LOCAL_MODULE:= lib64utils LOCAL_STATIC_LIBRARIES := liblog LOCAL_CFLAGS += $(host_commonCflags) -m64 -LOCAL_LDLIBS += $(host_commonLdlibs) include $(BUILD_HOST_STATIC_LIBRARY) @@ -98,10 +96,6 @@ LOCAL_SRC_FILES:= \ Looper.cpp \ Trace.cpp -ifeq ($(TARGET_OS),linux) -LOCAL_LDLIBS += -lrt -ldl -endif - ifeq ($(TARGET_ARCH),mips) LOCAL_CFLAGS += -DALIGN_DOUBLE endif @@ -110,8 +104,6 @@ LOCAL_C_INCLUDES += \ bionic/libc/private \ external/zlib -LOCAL_LDLIBS += -lpthread - LOCAL_STATIC_LIBRARIES := \ libcutils diff --git a/logcat/tests/Android.mk b/logcat/tests/Android.mk index d42b3d047..5d4d29ebc 100644 --- a/logcat/tests/Android.mk +++ b/logcat/tests/Android.mk @@ -40,7 +40,6 @@ LOCAL_MODULE := $(test_module) LOCAL_MODULE_TAGS := $(test_tags) LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_CFLAGS += $(test_c_flags) -LOCAL_LDLIBS := -lpthread LOCAL_SHARED_LIBRARIES := liblog LOCAL_SRC_FILES := $(test_src_files) include $(BUILD_NATIVE_TEST) |