aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2013-03-25 07:29:59 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-25 07:29:59 +0000
commitc74e41a41e6b7bc4b58e33891f23b630c72d32da (patch)
tree95806eac96e80fd849fa6eff2547a1c94057bda1
parent33ed961042887dc4566f6551343f4d73d36c2456 (diff)
parent293489d339df13fb95fa99eb08fc089e046a905f (diff)
downloadexternal_llvm-c74e41a41e6b7bc4b58e33891f23b630c72d32da.zip
external_llvm-c74e41a41e6b7bc4b58e33891f23b630c72d32da.tar.gz
external_llvm-c74e41a41e6b7bc4b58e33891f23b630c72d32da.tar.bz2
am 293489d3: am b497f3f2: Add missing libLLVMObject.a to .so build.
* commit '293489d339df13fb95fa99eb08fc089e046a905f': Add missing libLLVMObject.a to .so build.
-rw-r--r--shared_llvm.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/shared_llvm.mk b/shared_llvm.mk
index 43f0947..2ca7616 100644
--- a/shared_llvm.mk
+++ b/shared_llvm.mk
@@ -38,6 +38,7 @@ llvm_post_static_libraries := \
libLLVMAsmPrinter \
libLLVMSelectionDAG \
libLLVMCodeGen \
+ libLLVMObject \
libLLVMScalarOpts \
libLLVMInstCombine \
libLLVMInstrumentation \
@@ -113,4 +114,4 @@ LOCAL_SHARED_LIBRARIES := libcutils libdl libstlport
include $(LLVM_DEVICE_BUILD_MK)
include $(BUILD_SHARED_LIBRARY)
-endif # don't build in unbundled branches \ No newline at end of file
+endif # don't build in unbundled branches