From e65ac2e75d693930b7f7988e8be09fc157f68cab Mon Sep 17 00:00:00 2001
From: Shih-wei Liao <sliao@google.com>
Date: Tue, 13 Jul 2010 21:50:17 -0700
Subject: Add opt.

Change-Id: Icecd0b98914256237f5e34cb0b5e53b5dcac53e7
---
 Android.mk                                |  4 +++-
 lib/Analysis/Android.mk                   |  3 ++-
 lib/System/Android.mk                     |  5 ++++-
 lib/Transforms/Instrumentation/Android.mk | 19 +++++++++++++++++++
 tools/opt/Android.mk                      | 20 ++++++++++++++++++++
 5 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 lib/Transforms/Instrumentation/Android.mk
 create mode 100644 tools/opt/Android.mk

diff --git a/Android.mk b/Android.mk
index c7b82b5..8e885a6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -37,8 +37,10 @@ subdirs := $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, \
 		lib/MC/MCParser	\
                 tools/clang     \
                 lib/Linker      \
-                lib/AsmParser \
+                lib/AsmParser   \
                 tools/llvm-link \
+                lib/Transforms/Instrumentation \
+                tools/opt       \
 	))
 
 include $(LOCAL_PATH)/llvm.mk
diff --git a/lib/Analysis/Android.mk b/lib/Analysis/Android.mk
index 46a1041..06bf0ed 100644
--- a/lib/Analysis/Android.mk
+++ b/lib/Analysis/Android.mk
@@ -52,7 +52,8 @@ analysis_SRC_FILES :=	\
 # =====================================================
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := $(analysis_SRC_FILES)
+LOCAL_SRC_FILES := $(analysis_SRC_FILES) \
+                   Lint.cpp
 
 LOCAL_MODULE:= libLLVMAnalysis
 
diff --git a/lib/System/Android.mk b/lib/System/Android.mk
index f02a618..94eac30 100644
--- a/lib/System/Android.mk
+++ b/lib/System/Android.mk
@@ -28,7 +28,10 @@ include $(CLEAR_VARS)
 
 REQUIRES_RTTI := 1
 
-LOCAL_SRC_FILES := $(system_SRC_FILES)
+LOCAL_SRC_FILES := $(system_SRC_FILES) \
+                   DynamicLibrary.cpp  \
+                   SearchForAddressOfSpecialSymbol.cpp
+
 LOCAL_CFLAGS +=	-march=i686
 
 LOCAL_MODULE:= libLLVMSystem
diff --git a/lib/Transforms/Instrumentation/Android.mk b/lib/Transforms/Instrumentation/Android.mk
new file mode 100644
index 0000000..6623f9e
--- /dev/null
+++ b/lib/Transforms/Instrumentation/Android.mk
@@ -0,0 +1,19 @@
+ifeq ($(TARGET_ARCH),arm)
+
+LOCAL_PATH:= $(call my-dir)
+
+# For the host
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES :=      \
+     EdgeProfiling.cpp   \
+     ProfilingUtils.cpp      \
+     OptimalEdgeProfiling.cpp
+
+LOCAL_MODULE:= libLLVMInstrumentation
+
+include $(LLVM_HOST_BUILD_MK)
+include $(BUILD_HOST_STATIC_LIBRARY)
+
+endif
diff --git a/tools/opt/Android.mk b/tools/opt/Android.mk
new file mode 100644
index 0000000..29bdc34
--- /dev/null
+++ b/tools/opt/Android.mk
@@ -0,0 +1,20 @@
+# 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_LDLIBS += -lpthread -lm -ldl
+
+include $(LLVM_HOST_BUILD_MK)
+include $(LLVM_GEN_INTRINSICS_MK)
+include $(BUILD_HOST_EXECUTABLE)
+
+endif
-- 
cgit v1.1