commit 5a2ea99ee8b1e3d279561491b945283e86468865
author Stephen Hines <srhines@google.com> Thu May 03 18:53:43 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu May 03 18:53:43 2012 -0700
tree ed9b5ec7732b057867ac1082644800c594a7efb3
parent 82d4e6229a6877f39997a2ac11c7f2725f0221f8
parent 2f6a493aea1b6e5ad318a759fedb58713a5a374c

am 2f6a493a: Revert "Make libbcc public."

* commit '2f6a493aea1b6e5ad318a759fedb58713a5a374c':
  Revert "Make libbcc public."

tools/bcc/Android.mk

diff --git a/tools/bcc/Android.mk b/tools/bcc/Android.mk
index cc0c631..5301a6d 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
@@ -29,6 +26,9 @@
 
 LOCAL_SRC_FILES := main.cpp
 
+# 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
 
@@ -50,5 +50,3 @@
 include external/stlport/libstlport.mk
 include $(LIBBCC_DEVICE_BUILD_MK)
 include $(BUILD_EXECUTABLE)
-
-endif