commit 72e0850411da0770f1930bfc042ca5677a85e364
author The Android Automerger <android-build@android.com> Mon Mar 25 05:55:44 2013 -0700
committer The Android Automerger <android-build@android.com> Mon Mar 25 05:55:44 2013 -0700
tree 95806eac96e80fd849fa6eff2547a1c94057bda1
parent b497f3f2348cfff41652a8b93fc55e2360c47eef
parent 238bb0fd7d8cfbfca4918de5b6103c3f3e1808e0

merge in jb-mr2-release history after reset to jb-mr2-dev

shared_llvm.mk

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 @@
   libLLVMAsmPrinter \
   libLLVMSelectionDAG \
   libLLVMCodeGen \
+  libLLVMObject \
   libLLVMScalarOpts \
   libLLVMInstCombine \
   libLLVMInstrumentation \
@@ -113,4 +114,4 @@
 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