Clean up unnecessary build dependencies.

Bug: http://b/26797137

This change removes unneeded dependencies on libdl, libpthread,
libcutils, and even libc++.

Change-Id: Ifcb6f96c5b7d50dd6d1422e019ec14bde49a0fd6

diff --git a/shared_llvm.mk b/shared_llvm.mk
index 7a8cf6f..7906981 100644 (file)
--- a/shared_llvm.mk
+++ b/shared_llvm.mk
@@ -139,9 +139,6 @@ endif
 
 LOCAL_WHOLE_STATIC_LIBRARIES += $(llvm_post_static_libraries)
 
-#LOCAL_LDLIBS := -ldl -lpthread
-LOCAL_SHARED_LIBRARIES := libcutils libdl libc++
-
 include $(LLVM_DEVICE_BUILD_MK)
 include $(BUILD_SHARED_LIBRARY)
 

diff --git a/tools/llc/Android.mk b/tools/llc/Android.mk
index dd9cc6f..1a843ea 100644 (file)
--- a/tools/llc/Android.mk
+++ b/tools/llc/Android.mk
@@ -128,11 +128,6 @@ LOCAL_STATIC_LIBRARIES_arm64 += $(llvm_llc_arm_STATIC_LIBRARIES)
 
 LOCAL_STATIC_LIBRARIES += $(llvm_llc_STATIC_LIBRARIES)
 
-LOCAL_SHARED_LIBRARIES :=  \
-  libcutils  \
-  libdl  \
-  libc++
-
 include $(LLVM_ROOT_PATH)/llvm.mk
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_GEN_INTRINSICS_MK)

diff --git a/tools/llvm-link/Android.mk b/tools/llvm-link/Android.mk
index cbcd0af..b9b507b 100644 (file)
--- a/tools/llvm-link/Android.mk
+++ b/tools/llvm-link/Android.mk
@@ -25,7 +25,7 @@ LOCAL_MODULE := llvm-link
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(llvm_link_SRC_FILES)
 LOCAL_STATIC_LIBRARIES := $(llvm_link_STATIC_LIBRARIES)
-LOCAL_LDLIBS += -lpthread -lm -ldl
+LOCAL_LDLIBS += -lpthread
 
 include $(LLVM_HOST_BUILD_MK)
 include $(BUILD_HOST_EXECUTABLE)
@@ -41,9 +41,6 @@ LOCAL_MODULE := llvm-link
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(llvm_link_SRC_FILES)
 LOCAL_STATIC_LIBRARIES := $(llvm_link_STATIC_LIBRARIES)
-LOCAL_SHARED_LIBRARIES := \
-  libcutils  \
-  libc++
 
 include $(LLVM_DEVICE_BUILD_MK)
 include $(BUILD_EXECUTABLE)

diff --git a/tools/opt/Android.mk b/tools/opt/Android.mk
index 4abdade..08d7c5d 100644 (file)
--- a/tools/opt/Android.mk
+++ b/tools/opt/Android.mk
@@ -75,7 +75,7 @@ LOCAL_IS_HOST_MODULE := true
 
 LOCAL_SRC_FILES := $(llvm_opt_SRC_FILES)
 LOCAL_STATIC_LIBRARIES := $(llvm_opt_STATIC_LIBRARIES)
-LOCAL_LDLIBS += -lpthread -lm -ldl
+LOCAL_LDLIBS += -lpthread -ldl
 LOCAL_LDFLAGS_darwin := -Wl,-export_dynamic
 LOCAL_LDFLAGS_linux := -Wl,--export-dynamic
 
@@ -93,7 +93,6 @@ LOCAL_MODULE_CLASS := EXECUTABLES
 
 LOCAL_SRC_FILES := $(llvm_opt_SRC_FILES)
 LOCAL_STATIC_LIBRARIES := $(llvm_opt_STATIC_LIBRARIES)
-LOCAL_SHARED_LIBRARIES := libdl
 
 include $(LLVM_ROOT_PATH)/llvm.mk
 include $(LLVM_DEVICE_BUILD_MK)