diff options
| author | Stephen Hines <srhines@google.com> | 2016-01-26 22:29:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-01-26 22:29:48 +0000 |
| commit | 4310bcf018d080c679c61f59d2db434ccf06a412 (patch) | |
| tree | 2cb4942a5383b1902efef5feeae1917beae08ce8 | |
| parent | b92fdb80009e749762bccc61a30dadc17e83cfe3 (diff) | |
| parent | e3e6d19055aa5305392d0ccd2d784bf70fa0e3ba (diff) | |
| download | llvm-4310bcf018d080c679c61f59d2db434ccf06a412.tar.gz | |
Merge "Clean up unnecessary build dependencies."android-n-preview-1brillo-m10-releasebrillo-m10-dev
| -rw-r--r-- | shared_llvm.mk | 3 | ||||
| -rw-r--r-- | tools/llc/Android.mk | 5 | ||||
| -rw-r--r-- | tools/llvm-link/Android.mk | 5 | ||||
| -rw-r--r-- | tools/opt/Android.mk | 3 |
4 files changed, 2 insertions, 14 deletions
diff --git a/shared_llvm.mk b/shared_llvm.mk index 7a8cf6fbc31d..790698116e4b 100644 --- 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 dd9cc6fb3a17..1a843ea46ab9 100644 --- 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 cbcd0af06167..b9b507bc1a67 100644 --- 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 4abdade824fa..08d7c5d29f40 100644 --- 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) |