Update aosp/master LLVM for rebase to r256229

[android-x86/external-llvm.git] / lib / IR / Android.mk

diff --git a/lib/IR/Android.mk b/lib/IR/Android.mk
index b2b99e4..80df71d 100644 (file)
--- a/lib/IR/Android.mk
+++ b/lib/IR/Android.mk
@@ -5,32 +5,43 @@ vmcore_SRC_FILES := \
   Attributes.cpp \
   AutoUpgrade.cpp \
   BasicBlock.cpp \
+  Comdat.cpp \
   ConstantFold.cpp \
+  ConstantRange.cpp \
   Constants.cpp \
   Core.cpp \
   DataLayout.cpp \
   DebugInfo.cpp \
+  DebugInfoMetadata.cpp \
   DebugLoc.cpp \
+  DiagnosticInfo.cpp \
+  DiagnosticPrinter.cpp \
   DIBuilder.cpp \
   Dominators.cpp \
   Function.cpp \
+  FunctionInfo.cpp \
+  GCOV.cpp \
   GVMaterializer.cpp \
   Globals.cpp \
   IRBuilder.cpp \
+  IRPrintingPasses.cpp \
   InlineAsm.cpp \
   Instruction.cpp \
   Instructions.cpp \
   IntrinsicInst.cpp \
   LLVMContext.cpp \
   LLVMContextImpl.cpp \
-  LeakDetector.cpp \
   LegacyPassManager.cpp \
+  Mangler.cpp \
+  MDBuilder.cpp \
   Metadata.cpp \
+  MetadataTracking.cpp \
   Module.cpp \
+  Operator.cpp \
   Pass.cpp \
   PassManager.cpp \
   PassRegistry.cpp \
-  PrintModulePass.cpp \
+  Statepoint.cpp \
   Type.cpp \
   TypeFinder.cpp \
   Use.cpp \
@@ -50,15 +61,17 @@ LOCAL_SRC_FILES := $(vmcore_SRC_FILES)
 
 LOCAL_MODULE:= libLLVMCore
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM_HOST_BUILD_MK)
+include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
 # =====================================================
 include $(CLEAR_VARS)
+ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 
 REQUIRES_RTTI := 1
 
@@ -66,8 +79,8 @@ LOCAL_SRC_FILES := $(vmcore_SRC_FILES)
 
 LOCAL_MODULE:= libLLVMCore
 
-LOCAL_MODULE_TAGS := optional
-
 include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(LLVM_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
+endif