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 7b0a0e9..80df71d 100644 (file)
--- a/lib/IR/Android.mk
+++ b/lib/IR/Android.mk
@@ -19,6 +19,7 @@ vmcore_SRC_FILES := \
   DIBuilder.cpp \
   Dominators.cpp \
   Function.cpp \
+  FunctionInfo.cpp \
   GCOV.cpp \
   GVMaterializer.cpp \
   Globals.cpp \
@@ -60,9 +61,10 @@ 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)
 
@@ -77,9 +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