commit 030a96722a2407202329bddf6ba69dbe14bbb52f
author Stephen Hines <srhines@google.com> Thu May 03 19:22:44 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu May 03 19:22:44 2012 -0700
tree cd8a9d2f6049b0afc89ed392985989e999a74836
parent 35d04da049fae154b892873f600bca1754318942
parent ead5ccba05af33df1a061b39847a9be137c00143

am ead5ccba: Revert "Refactor SourceInfo into Source."

* commit 'ead5ccba05af33df1a061b39847a9be137c00143':
  Revert "Refactor SourceInfo into Source."

tools/bcc/Android.mk

diff --git a/tools/bcc/Android.mk b/tools/bcc/Android.mk
index 414b4d2..3231228 100644
--- a/tools/bcc/Android.mk
+++ b/tools/bcc/Android.mk
@@ -14,9 +14,6 @@
 # limitations under the License.
 #
 
-ifeq (darwin,$(BUILD_OS))
-else
-
 LOCAL_PATH := $(call my-dir)
 
 # Executable for host
@@ -36,6 +33,10 @@
 
 LOCAL_MODULE_TAGS := tests eng
 
+# The definition of those functions in libLLVMSupport may elude libbcc due to linker.
+# Should include libLLVMSupport since bcc references some functions within it.
+LOCAL_STATIC_LIBRARIES := libLLVMSupport
+LOCAL_SHARED_LIBRARIES := libbcc
 LOCAL_LDLIBS = -ldl
 
 LOCAL_CFLAGS += -D__HOST__ -Wall -Werror
@@ -60,5 +61,3 @@
 
 include external/stlport/libstlport.mk
 include $(BUILD_EXECUTABLE)
-
-endif