Add llvm opt executable build rules.android-sdk-adt_r16.0.1android-cts-4.0_r1android-4.0.2_r1android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1ics-mr0-releaseics-mr0ics-factoryrom-2-release

Change-Id: Iff13d577acf9b9aec2de52633b5e708bf1416f06

5 files changed, 44 insertions, 26 deletions

diff --git a/lib/Analysis/IPA/Android.mk b/lib/Analysis/IPA/Android.mk
index ffa9f44fb0f8..a1f47f386099 100644
--- a/lib/Analysis/IPA/Android.mk
+++ b/lib/Analysis/IPA/Android.mk
@@ -1,10 +1,11 @@
 LOCAL_PATH:= $(call my-dir)
 
-analysis_ipa_SRC_FILES :=	\
-	CallGraph.cpp	\
-	CallGraphSCCPass.cpp	\
-	FindUsedTypes.cpp	\
-	GlobalsModRef.cpp
+analysis_ipa_SRC_FILES := \
+  CallGraph.cpp \
+  CallGraphSCCPass.cpp \
+  FindUsedTypes.cpp \
+  GlobalsModRef.cpp \
+  IPA.cpp
 
 # For the host
 # =====================================================
diff --git a/lib/Transforms/Scalar/Android.mk b/lib/Transforms/Scalar/Android.mk
index a57d4bde5958..88c0bb3b79da 100644
--- a/lib/Transforms/Scalar/Android.mk
+++ b/lib/Transforms/Scalar/Android.mk
@@ -15,6 +15,7 @@ transforms_scalar_SRC_FILES := \
 	LICM.cpp    \
 	LoopDeletion.cpp    \
 	LoopIdiomRecognize.cpp \
+	LoopInstSimplify.cpp \
 	LoopRotation.cpp    \
 	LoopStrengthReduce.cpp  \
 	LoopUnrollPass.cpp  \
diff --git a/lib/Transforms/Utils/Android.mk b/lib/Transforms/Utils/Android.mk
index 37278949c2c7..c4018e265530 100644
--- a/lib/Transforms/Utils/Android.mk
+++ b/lib/Transforms/Utils/Android.mk
@@ -25,6 +25,7 @@ transforms_utils_SRC_FILES :=	\
 	SimplifyCFG.cpp	\
 	SimplifyInstructions.cpp	\
 	UnifyFunctionExitNodes.cpp	\
+	Utils.cpp \
 	ValueMapper.cpp
 
 # For the host
diff --git a/tools/opt/Android.mk b/tools/opt/Android.mk
new file mode 100644
index 000000000000..7e7455e18b52
--- /dev/null
+++ b/tools/opt/Android.mk
@@ -0,0 +1,36 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := opt
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := EXECUTABLES
+
+LOCAL_SRC_FILES := \
+  AnalysisWrappers.cpp \
+  GraphPrinters.cpp \
+  PrintSCC.cpp \
+  opt.cpp
+
+LOCAL_STATIC_LIBRARIES := \
+  libLLVMipo \
+  libLLVMScalarOpts \
+  libLLVMInstCombine \
+  libLLVMInstrumentation \
+  libLLVMTransformUtils \
+  libLLVMipa \
+  libLLVMAnalysis \
+  libLLVMTarget \
+  libLLVMMC \
+  libLLVMAsmParser \
+  libLLVMBitWriter \
+  libLLVMBitReader \
+  libLLVMCore \
+  libLLVMSupport
+
+LOCAL_LDLIBS += -lpthread -lm -ldl
+
+LOCAL_C_INCLUDES += external/llvm/include
+
+include $(LLVM_HOST_BUILD_MK)
+include $(LLVM_GEN_INTRINSICS_MK)
+include $(BUILD_HOST_EXECUTABLE)
diff --git a/tools/opt/Android.mk.disabled b/tools/opt/Android.mk.disabled
deleted file mode 100644
index d03aa41dfea6..000000000000
--- a/tools/opt/Android.mk.disabled
+++ /dev/null
@@ -1,21 +0,0 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES :=	  \
-	opt.cpp           \
-        GraphPrinters.cpp \
-        PrintSCC.cpp
-
-LOCAL_STATIC_LIBRARIES := libLLVMipo libLLVMScalarOpts libLLVMInstCombine libLLVMInstrumentation libLLVMTransformUtils libLLVMipa libLLVMAnalysis libLLVMTarget libLLVMMC libLLVMAsmParser libLLVMBitWriter libLLVMBitReader libLLVMCore libLLVMSupport libLLVMSystem
-LOCAL_MODULE := opt
-LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_LDLIBS += -lpthread -lm -ldl
-
-include $(LLVM_HOST_BUILD_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
-include $(BUILD_HOST_EXECUTABLE)
-
-endif