Rollback "[Support] Add RetryAfterSignal helper function"

[android-x86/external-llvm.git] / shared_llvm.mk

diff --git a/shared_llvm.mk b/shared_llvm.mk
index 6b44bf1..855e743 100644 (file)
--- a/shared_llvm.mk
+++ b/shared_llvm.mk
@@ -8,6 +8,7 @@ llvm_pre_static_libraries := \
   libLLVM70Symbolize \
   libLLVM70DebugInfoMSF \
   libLLVM70DebugInfoCodeView \
+  libLLVM70Demangle \
   libLLVM70IRReader \
   libLLVM70BitWriter \
   libLLVM70BitReader \
@@ -19,7 +20,8 @@ llvm_arm_static_libraries := \
   libLLVM70ARMAsmPrinter \
   libLLVM70ARMInfo \
   libLLVM70ARMDesc \
-  libLLVM70ARMDisassembler
+  libLLVM70ARMDisassembler \
+  libLLVM70ARMUtils
 
 llvm_x86_static_libraries := \
   libLLVM70X86CodeGen \
@@ -63,6 +65,7 @@ llvm_post_static_libraries := \
   libLLVM70CodeGen \
   libLLVM70Object \
   libLLVM70ScalarOpts \
+  libLLVM70AggressiveInstCombine \
   libLLVM70InstCombine \
   libLLVM70Instrumentation \
   libLLVM70TransformObjCARC \
@@ -117,9 +120,9 @@ LOCAL_LDLIBS_linux := -ldl -lpthread
 # Use prebuilts for linux and darwin unless
 # FORCE_BUILD_LLVM_COMPONENTS is true
 ifneq (true,$(FORCE_BUILD_LLVM_COMPONENTS))
-LOCAL_MODULE_HOST_OS := windows
+LOCAL_MODULE_HOST_OS := linux
 else
-LOCAL_MODULE_HOST_OS := darwin linux windows
+LOCAL_MODULE_HOST_OS := linux
 endif
 
 include $(LLVM70_HOST_BUILD_MK)