ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 1e6cd741: am 803fb62b: Merge "Remove unused LOCAL_LDLIBS."

Browse source 
* commit '1e6cd741fd130e5916337eb75c9ceef2152035d2':
  Remove unused LOCAL_LDLIBS.
This commit is contained in:
Ying Wang 2014-05-07 23:01:12 +00:00 • committed by Android Git Automerger
commit b18da571f9
7 changed files with 1 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
adb/Android.mk
View file

@ -138,8 +138,6 @@ include $(BUILD_EXECUTABLE)
ifneq ($(SDK_ONLY),true) ifneq ($(SDK_ONLY),true)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_LDLIBS := -lrt -ldl -lpthread
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
adb.c \ adb.c \
console.c \ console.c \

4
libbacktrace/Android.mk
View file

@ -105,10 +105,8 @@ backtrace_test_src_files := \
GetPss.cpp \ GetPss.cpp \
thread_utils.c \ thread_utils.c \
backtrace_test_ldlibs := \
-lpthread \
backtrace_test_ldlibs_host := \ backtrace_test_ldlibs_host := \
-lpthread \
-lrt \ -lrt \
backtrace_test_shared_libraries := \ backtrace_test_shared_libraries := \

2
libcutils/Android.mk
View file

@ -75,7 +75,6 @@ endif
# ======================================================== # ========================================================
LOCAL_MODULE := libcutils LOCAL_MODULE := libcutils
LOCAL_SRC_FILES := $(commonSources) $(commonHostSources) dlmalloc_stubs.c LOCAL_SRC_FILES := $(commonSources) $(commonHostSources) dlmalloc_stubs.c
LOCAL_LDLIBS := -lpthread
LOCAL_STATIC_LIBRARIES := liblog LOCAL_STATIC_LIBRARIES := liblog
LOCAL_CFLAGS += $(hostSmpFlag) LOCAL_CFLAGS += $(hostSmpFlag)
ifneq ($(HOST_OS),windows) ifneq ($(HOST_OS),windows)
@ -89,7 +88,6 @@ include $(BUILD_HOST_STATIC_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := lib64cutils LOCAL_MODULE := lib64cutils
LOCAL_SRC_FILES := $(commonSources) $(commonHostSources) dlmalloc_stubs.c LOCAL_SRC_FILES := $(commonSources) $(commonHostSources) dlmalloc_stubs.c
LOCAL_LDLIBS := -lpthread
LOCAL_STATIC_LIBRARIES := lib64log LOCAL_STATIC_LIBRARIES := lib64log
LOCAL_CFLAGS += $(hostSmpFlag) -m64 LOCAL_CFLAGS += $(hostSmpFlag) -m64
ifneq ($(HOST_OS),windows) ifneq ($(HOST_OS),windows)

8
liblog/Android.mk
View file

@ -57,10 +57,6 @@ endif
# ======================================================== # ========================================================
LOCAL_MODULE := liblog LOCAL_MODULE := liblog
LOCAL_SRC_FILES := $(liblog_host_sources) LOCAL_SRC_FILES := $(liblog_host_sources)
LOCAL_LDLIBS := -lpthread
ifeq ($(strip $(HOST_OS)),linux)
LOCAL_LDLIBS += -lrt
endif
LOCAL_CFLAGS := -DFAKE_LOG_DEVICE=1 LOCAL_CFLAGS := -DFAKE_LOG_DEVICE=1
include $(BUILD_HOST_STATIC_LIBRARY) include $(BUILD_HOST_STATIC_LIBRARY)
@ -78,10 +74,6 @@ include $(BUILD_HOST_SHARED_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := lib64log LOCAL_MODULE := lib64log
LOCAL_SRC_FILES := $(liblog_host_sources) 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 LOCAL_CFLAGS := -DFAKE_LOG_DEVICE=1 -m64
include $(BUILD_HOST_STATIC_LIBRARY) include $(BUILD_HOST_STATIC_LIBRARY)

1
liblog/tests/Android.mk
View file

@ -83,7 +83,6 @@ LOCAL_MODULE := $(test_module_prefix)unit-tests
LOCAL_MODULE_TAGS := $(test_tags) LOCAL_MODULE_TAGS := $(test_tags)
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_CFLAGS += $(test_c_flags) LOCAL_CFLAGS += $(test_c_flags)
LOCAL_LDLIBS := -lpthread
LOCAL_SHARED_LIBRARIES := liblog LOCAL_SHARED_LIBRARIES := liblog
LOCAL_SRC_FILES := $(test_src_files) LOCAL_SRC_FILES := $(test_src_files)
include $(BUILD_NATIVE_TEST) include $(BUILD_NATIVE_TEST)

8
libutils/Android.mk
View file

@ -69,7 +69,6 @@ endif
LOCAL_MODULE:= libutils LOCAL_MODULE:= libutils
LOCAL_STATIC_LIBRARIES := liblog LOCAL_STATIC_LIBRARIES := liblog
LOCAL_CFLAGS += $(host_commonCflags) LOCAL_CFLAGS += $(host_commonCflags)
LOCAL_LDLIBS += $(host_commonLdlibs)
include $(BUILD_HOST_STATIC_LIBRARY) include $(BUILD_HOST_STATIC_LIBRARY)
@ -83,7 +82,6 @@ endif
LOCAL_MODULE:= lib64utils LOCAL_MODULE:= lib64utils
LOCAL_STATIC_LIBRARIES := liblog LOCAL_STATIC_LIBRARIES := liblog
LOCAL_CFLAGS += $(host_commonCflags) -m64 LOCAL_CFLAGS += $(host_commonCflags) -m64
LOCAL_LDLIBS += $(host_commonLdlibs)
include $(BUILD_HOST_STATIC_LIBRARY) include $(BUILD_HOST_STATIC_LIBRARY)
@ -98,10 +96,6 @@ LOCAL_SRC_FILES:= \
Looper.cpp \ Looper.cpp \
Trace.cpp Trace.cpp
ifeq ($(TARGET_OS),linux)
LOCAL_LDLIBS += -lrt -ldl
endif
ifeq ($(TARGET_ARCH),mips) ifeq ($(TARGET_ARCH),mips)
LOCAL_CFLAGS += -DALIGN_DOUBLE LOCAL_CFLAGS += -DALIGN_DOUBLE
endif endif
@ -110,8 +104,6 @@ LOCAL_C_INCLUDES += \
bionic/libc/private \ bionic/libc/private \
external/zlib external/zlib
LOCAL_LDLIBS += -lpthread
LOCAL_STATIC_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \
libcutils libcutils

1
logcat/tests/Android.mk
View file

@ -40,7 +40,6 @@ LOCAL_MODULE := $(test_module)
LOCAL_MODULE_TAGS := $(test_tags) LOCAL_MODULE_TAGS := $(test_tags)
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_CFLAGS += $(test_c_flags) LOCAL_CFLAGS += $(test_c_flags)
LOCAL_LDLIBS := -lpthread
LOCAL_SHARED_LIBRARIES := liblog LOCAL_SHARED_LIBRARIES := liblog
LOCAL_SRC_FILES := $(test_src_files) LOCAL_SRC_FILES := $(test_src_files)
include $(BUILD_NATIVE_TEST) include $(BUILD_NATIVE_TEST)