Revert "Change libbcc so that it compiles as an LLVM loadable module."
This reverts commit 0eb3c42fedcd0a9770be27ae43f42f20b0fd7dea.
diff --git a/Android.mk b/Android.mk
index 4cb45d3..1ab8386 100644
--- a/Android.mk
+++ b/Android.mk
@@ -98,15 +98,7 @@
libcutils \
liblog
-LOCAL_SHARED_LIBRARIES := libbcinfo
-
-ifeq (true,$(FORCE_BUILD_LLVM_COMPONENTS))
-# This line allows libbcc to be used as an LLVM loadable module with
-# opt. We don't build unless we have libLLVMLinker, which is not
-# provided as a prebuilt. libLLVMLinker is needed because it is not
-# pulled into opt.
-LOCAL_STATIC_LIBRARIES += libLLVMLinker
-endif
+LOCAL_SHARED_LIBRARIES := libbcinfo libLLVM
ifndef USE_MINGW
LOCAL_LDLIBS := -ldl -lpthread
diff --git a/bcinfo/Android.mk b/bcinfo/Android.mk
index 9a05c82..5a55014 100644
--- a/bcinfo/Android.mk
+++ b/bcinfo/Android.mk
@@ -80,6 +80,7 @@
LOCAL_STATIC_LIBRARIES += $(libbcinfo_STATIC_LIBRARIES)
LOCAL_STATIC_LIBRARIES += libcutils liblog
+LOCAL_SHARED_LIBRARIES += libLLVM
ifndef USE_MINGW
LOCAL_LDLIBS := -ldl -lpthread