Update aosp/master LLVM for rebase to r256229

[android-x86/external-llvm.git] / tools / llvm-as / Android.mk

diff --git a/tools/llvm-as/Android.mk b/tools/llvm-as/Android.mk
index e58868b..404f3b7 100644 (file)
--- a/tools/llvm-as/Android.mk
+++ b/tools/llvm-as/Android.mk
@@ -6,17 +6,13 @@ llvm_as_SRC_FILES := \
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := llvm-as
+LOCAL_MODULE_CLASS := EXECUTABLES
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(llvm_as_SRC_FILES)
 LOCAL_LDLIBS += -lm
-ifdef USE_MINGW
-LOCAL_LDLIBS += -limagehlp
-else
-LOCAL_LDLIBS += -lpthread -ldl
-endif
-
-REQUIRES_EH := 1
-REQUIRES_RTTI := 1
+LOCAL_LDLIBS_windows := -limagehlp
+LOCAL_LDLIBS_darwin := -lpthread -ldl
+LOCAL_LDLIBS_linux := -lpthread -ldl
 
 LOCAL_STATIC_LIBRARIES := \
   libLLVMAsmParser \
@@ -25,4 +21,5 @@ LOCAL_STATIC_LIBRARIES := \
   libLLVMSupport
 
 include $(LLVM_HOST_BUILD_MK)
+include $(LLVM_GEN_ATTRIBUTES_MK)
 include $(BUILD_HOST_EXECUTABLE)