4 files changed, 22 insertions, 19 deletions
diff --git a/tools/llc/Android.mk b/tools/llc/Android.mk
index 0a693ba..f9c76cc 100644
--- a/tools/llc/Android.mk
+++ b/tools/llc/Android.mk
@@ -54,8 +54,8 @@ LOCAL_STATIC_LIBRARIES := \
   libLLVMX86AsmParser \
   libLLVMX86CodeGen \
   libLLVMX86Disassembler \
-  libLLVMX86AsmPrinter \
   libLLVMX86Desc \
+  libLLVMX86AsmPrinter \
   libLLVMX86Utils \
   $(llvm_llc_STATIC_LIBRARIES)
 LOCAL_LDLIBS += -lpthread -lm -ldl
diff --git a/tools/llvm-as/Android.mk b/tools/llvm-as/Android.mk
index b44ecb7..44f3d4f 100644
--- a/tools/llvm-as/Android.mk
+++ b/tools/llvm-as/Android.mk
@@ -1,23 +1,23 @@
 LOCAL_PATH:= $(call my-dir)
 
+llvm_as_SRC_FILES := \
+  llvm-as.cpp
+
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := llvm-as
-
-LOCAL_SRC_FILES := llvm-as.cpp
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(llvm_as_SRC_FILES)
+LOCAL_LDLIBS += -lpthread -lm -ldl
 
 REQUIRES_EH := 1
 REQUIRES_RTTI := 1
 
 LOCAL_STATIC_LIBRARIES := \
-    libLLVMAsmParser \
-    libLLVMBitWriter \
-    libLLVMCore \
-    libLLVMSupport
-
-LOCAL_LDLIBS += -lpthread -lm -ldl
-
-LOCAL_MODULE_TAGS := optional
+  libLLVMAsmParser \
+  libLLVMBitWriter \
+  libLLVMCore \
+  libLLVMSupport
 
 include $(LLVM_HOST_BUILD_MK)
 include $(BUILD_HOST_EXECUTABLE)
diff --git a/tools/llvm-link/Android.mk b/tools/llvm-link/Android.mk
index bcf70e5..96dfff9 100644
--- a/tools/llvm-link/Android.mk
+++ b/tools/llvm-link/Android.mk
@@ -7,10 +7,12 @@ llvm_link_STATIC_LIBRARIES := \
   libLLVMLinker \
   libLLVMBitReader \
   libLLVMBitWriter \
-  libLLVMCore \
-  libLLVMSupport \
   libLLVMAsmParser \
-  libLLVMTransformUtils
+  libLLVMTransformUtils \
+  libLLVMAnalysis \
+  libLLVMTarget \
+  libLLVMCore \
+  libLLVMSupport
 
 #===---------------------------------------------------------------===
 # llvm-link command line tool (host)
diff --git a/tools/opt/Android.mk b/tools/opt/Android.mk
index 77bb2a2..f4388fe 100644
--- a/tools/opt/Android.mk
+++ b/tools/opt/Android.mk
@@ -14,18 +14,19 @@ llvm_opt_SRC_FILES := \
   opt.cpp
 
 llvm_opt_STATIC_LIBRARIES := \
-  libLLVMipo \
   libLLVMScalarOpts \
   libLLVMInstCombine \
   libLLVMInstrumentation \
-  libLLVMTransformUtils \
-  libLLVMipa \
-  libLLVMAnalysis \
-  libLLVMTarget \
+  libLLVMMCParser \
   libLLVMMC \
   libLLVMAsmParser \
   libLLVMBitWriter \
   libLLVMBitReader \
+  libLLVMipa \
+  libLLVMipo \
+  libLLVMTransformUtils \
+  libLLVMAnalysis \
+  libLLVMTarget \
   libLLVMCore \
   libLLVMSupport