Revert "Change libbcc so that it compiles as an LLVM loadable module (try 2)."
This reverts commit b58df0c96e17a33741adc8116af77ba16882bbfc.
Revert "Add libLLVM to LOCAL_LDLIBS so that the mac build can link correctly."
This reverts commit 90d862c2ff39787cbe377131294d29b1965706c7.
Both patches are reverted since this exposed a different Linux breakage
(when we aren't using FORCE_BUILD_LLVM_COMPONENTS).
diff --git a/Android.mk b/Android.mk
index d1bf790..1ab8386 100644
--- a/Android.mk
+++ b/Android.mk
@@ -98,22 +98,11 @@
libcutils \
liblog
-LOCAL_SHARED_LIBRARIES := libbcinfo
+LOCAL_SHARED_LIBRARIES := libbcinfo libLLVM
-ifdef USE_MINGW
-# Windows needs libLLVM, since DLLs must really have fully resolved their
-# symbolic dependencies.
-LOCAL_SHARED_LIBRARIES += libLLVM
-else
-LOCAL_LDLIBS := -ldl -lpthread -lLLVM
-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 # FORCE_BUILD_LLVM_COMPONENTS
-endif # USE_MINGW
+ifndef USE_MINGW
+LOCAL_LDLIBS := -ldl -lpthread
+endif
include $(LIBBCC_HOST_BUILD_MK)
include $(LLVM_HOST_BUILD_MK)
diff --git a/bcinfo/Android.mk b/bcinfo/Android.mk
index 573aa82..5a55014 100644
--- a/bcinfo/Android.mk
+++ b/bcinfo/Android.mk
@@ -80,13 +80,10 @@
LOCAL_STATIC_LIBRARIES += $(libbcinfo_STATIC_LIBRARIES)
LOCAL_STATIC_LIBRARIES += libcutils liblog
-
-ifdef USE_MINGW
-# Windows needs libLLVM, since DLLs must really have fully resolved their
-# symbolic dependencies.
LOCAL_SHARED_LIBRARIES += libLLVM
-else
-LOCAL_LDLIBS := -ldl -lpthread -lLLVM
+
+ifndef USE_MINGW
+LOCAL_LDLIBS := -ldl -lpthread
endif
include $(LLVM_ROOT_PATH)/llvm-host-build.mk
