4 files changed, 91 insertions, 1 deletions
diff --git a/utils/FileCheck/Android.mk b/utils/FileCheck/Android.mk
index 2c211cf..3d32008 100644
--- a/utils/FileCheck/Android.mk
+++ b/utils/FileCheck/Android.mk
@@ -11,7 +11,6 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := FileCheck
 LOCAL_SRC_FILES := $(filecheck_SRC_FILES)
 LOCAL_STATIC_LIBRARIES := $(filecheck_STATIC_LIBRARIES)
-LOCAL_C_INCLUDES += external/llvm/include
 LOCAL_C_INCLUDES += external/llvm/host/include
 LOCAL_LDLIBS += -lpthread -lm -ldl
 LOCAL_CFLAGS += -D __STDC_LIMIT_MACROS -D __STDC_CONSTANT_MACROS
diff --git a/utils/FileUpdate/Android.mk b/utils/FileUpdate/Android.mk
new file mode 100644
index 0000000..d2b82f2
--- /dev/null
+++ b/utils/FileUpdate/Android.mk
@@ -0,0 +1,33 @@
+LOCAL_PATH := $(call my-dir)
+
+LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
+
+
+#===---------------------------------------------------------------===
+# FileUpdate command line tool
+#===---------------------------------------------------------------===
+
+file_update_SRC_FILES := \
+  FileUpdate.cpp
+
+file_update_STATIC_LIBRARIES := \
+  libLLVMCore               \
+  libLLVMSupport            \
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := FileUpdate
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_IS_HOST_MODULE := true
+
+LOCAL_SRC_FILES := $(file_update_SRC_FILES)
+
+LOCAL_STATIC_LIBRARIES := $(file_update_STATIC_LIBRARIES)
+
+LOCAL_LDLIBS += -lpthread -lm -ldl
+
+include $(LLVM_ROOT_PATH)/llvm.mk
+include $(LLVM_HOST_BUILD_MK)
+include $(LLVM_GEN_INTRINSICS_MK)
+include $(BUILD_HOST_EXECUTABLE)
diff --git a/utils/count/Android.mk b/utils/count/Android.mk
new file mode 100644
index 0000000..1ee8271
--- /dev/null
+++ b/utils/count/Android.mk
@@ -0,0 +1,26 @@
+LOCAL_PATH := $(call my-dir)
+
+LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
+
+
+#===---------------------------------------------------------------===
+# count command line tool
+#===---------------------------------------------------------------===
+
+count_SRC_FILES := \
+  count.c
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := count
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_IS_HOST_MODULE := true
+
+LOCAL_SRC_FILES := $(count_SRC_FILES)
+
+LOCAL_LDLIBS += -lpthread -lm -ldl
+
+include $(LLVM_ROOT_PATH)/llvm.mk
+include $(LLVM_HOST_BUILD_MK)
+include $(BUILD_HOST_EXECUTABLE)
diff --git a/utils/not/Android.mk b/utils/not/Android.mk
new file mode 100644
index 0000000..93d2a46
--- /dev/null
+++ b/utils/not/Android.mk
@@ -0,0 +1,32 @@
+LOCAL_PATH := $(call my-dir)
+
+LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
+
+
+#===---------------------------------------------------------------===
+# not command line tool
+#===---------------------------------------------------------------===
+
+not_SRC_FILES := \
+  not.cpp
+
+not_STATIC_LIBRARIES := \
+  libLLVMCore               \
+  libLLVMSupport            \
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := not
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_IS_HOST_MODULE := true
+
+LOCAL_SRC_FILES := $(not_SRC_FILES)
+
+LOCAL_STATIC_LIBRARIES := $(not_STATIC_LIBRARIES)
+
+LOCAL_LDLIBS += -lpthread -lm -ldl
+
+include $(LLVM_ROOT_PATH)/llvm.mk
+include $(LLVM_HOST_BUILD_MK)
+include $(BUILD_HOST_EXECUTABLE)