Update aosp/master LLVM for rebase to r256229

[android-x86/external-llvm.git] / lib / Target / Mips / TargetInfo / Android.mk

diff --git a/lib/Target/Mips/TargetInfo/Android.mk b/lib/Target/Mips/TargetInfo/Android.mk
index e3f41bc..e040904 100644 (file)
--- a/lib/Target/Mips/TargetInfo/Android.mk
+++ b/lib/Target/Mips/TargetInfo/Android.mk
@@ -14,7 +14,7 @@ include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMMipsInfo
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := darwin linux windows
 
 TBLGEN_TABLES := $(mips_target_info_TBLGEN_TABLES)
 TBLGEN_TD_DIR := $(LOCAL_PATH)/..
@@ -24,16 +24,16 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
+include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
 # =====================================================
-ifeq ($(TARGET_ARCH),mips)
+ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
 LOCAL_MODULE:= libLLVMMipsInfo
-LOCAL_MODULE_TAGS := optional
 
 TBLGEN_TABLES := $(mips_target_info_TBLGEN_TABLES)
 TBLGEN_TD_DIR := $(LOCAL_PATH)/..
@@ -43,5 +43,6 @@ LOCAL_C_INCLUDES +=   $(LOCAL_PATH)/..
 
 include $(LLVM_DEVICE_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
+include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif