android: update version in {config,llvm-config}.h headers

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

diff --git a/shared_llvm.mk b/shared_llvm.mk
index 627e08e..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,15 +120,15 @@ 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 $(LLVM_HOST_BUILD_MK)
+include $(LLVM70_HOST_BUILD_MK)
 include $(BUILD_HOST_SHARED_LIBRARY)
 
-ifeq (,$(filter $(TARGET_ARCH),$(LLVM_SUPPORTED_ARCH)))
+ifeq (,$(filter $(TARGET_ARCH),$(LLVM70_SUPPORTED_ARCH)))
 $(warning TODO $(TARGET_ARCH): Enable llvm build)
 endif
 
@@ -160,7 +163,15 @@ LOCAL_WHOLE_STATIC_LIBRARIES += \
   $(llvm_device_static_libraries) \
   $(llvm_post_static_libraries)
 
-include $(LLVM_DEVICE_BUILD_MK)
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_EXPORT_C_INCLUDE_DIRS := \
+  $(LOCAL_PATH)/include \
+  $(LOCAL_PATH)/device/include \
+  $(call local-generated-sources-dir)
+
+include $(LLVM70_DEVICE_BUILD_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_SHARED_LIBRARY)
 
 endif