Convert the rest of llvm to Android.bp

A few makefiles still exist in external/llvm/*.mk, they are referenced
outside external/llvm but no longer used by anything in external/llvm.

Test: m -j checkbuild
Change-Id: I8227d8feeac7314c237d2d3379b473dc0ee03ded

8 files changed, 41 insertions, 108 deletions

diff --git a/utils/FileCheck/Android.bp b/utils/FileCheck/Android.bp
new file mode 100644
index 000000000000..e21b9de8b968
--- /dev/null
+++ b/utils/FileCheck/Android.bp
@@ -0,0 +1,10 @@
+cc_binary_host {
+    name: "FileCheck",
+    defaults: ["llvm-defaults"],
+    srcs: ["FileCheck.cpp"],
+    static_libs: ["libLLVMSupport"],
+    cflags: [
+        "-D__STDC_LIMIT_MACROS",
+        "-D__STDC_CONSTANT_MACROS",
+    ],
+}
diff --git a/utils/FileCheck/Android.mk b/utils/FileCheck/Android.mk
deleted file mode 100644
index 3d32008e09bd..000000000000
--- a/utils/FileCheck/Android.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-filecheck_SRC_FILES := \
-  FileCheck.cpp
-
-filecheck_STATIC_LIBRARIES := \
-  libLLVMSupport
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := FileCheck
-LOCAL_SRC_FILES := $(filecheck_SRC_FILES)
-LOCAL_STATIC_LIBRARIES := $(filecheck_STATIC_LIBRARIES)
-LOCAL_C_INCLUDES += external/llvm/host/include
-LOCAL_LDLIBS += -lpthread -lm -ldl
-LOCAL_CFLAGS += -D __STDC_LIMIT_MACROS -D __STDC_CONSTANT_MACROS
-
-#REQUIRES_EH := 1
-#REQUIRES_RTTI := 1
-
-include $(LLVM_HOST_BUILD_MK)
-include $(BUILD_HOST_EXECUTABLE)
diff --git a/utils/count/Android.bp b/utils/count/Android.bp
new file mode 100644
index 000000000000..1d438093a66f
--- /dev/null
+++ b/utils/count/Android.bp
@@ -0,0 +1,9 @@
+//===---------------------------------------------------------------===
+// count command line tool
+//===---------------------------------------------------------------===
+
+cc_binary_host {
+    name: "count",
+    defaults: ["llvm-defaults"],
+    srcs: ["count.c"],
+}
diff --git a/utils/count/Android.mk b/utils/count/Android.mk
deleted file mode 100644
index 1ee8271b631c..000000000000
--- a/utils/count/Android.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-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.bp b/utils/not/Android.bp
new file mode 100644
index 000000000000..25a2f83e49ea
--- /dev/null
+++ b/utils/not/Android.bp
@@ -0,0 +1,13 @@
+//===---------------------------------------------------------------===
+// not command line tool
+//===---------------------------------------------------------------===
+
+cc_binary_host {
+    name: "not",
+    defaults: ["llvm-defaults"],
+    srcs: ["not.cpp"],
+    static_libs: [
+        "libLLVMCore",
+        "libLLVMSupport",
+    ],
+}
diff --git a/utils/not/Android.mk b/utils/not/Android.mk
deleted file mode 100644
index 93d2a46c0939..000000000000
--- a/utils/not/Android.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-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)
diff --git a/utils/yaml-bench/Android.bp b/utils/yaml-bench/Android.bp
new file mode 100644
index 000000000000..df5092fbc84e
--- /dev/null
+++ b/utils/yaml-bench/Android.bp
@@ -0,0 +1,9 @@
+// yaml-bench executable for the host
+// =====================================================
+
+cc_binary_host {
+    name: "yaml-bench",
+    defaults: ["llvm-defaults"],
+    srcs: ["YAMLBench.cpp"],
+    static_libs: ["libLLVMSupport"],
+}
diff --git a/utils/yaml-bench/Android.mk b/utils/yaml-bench/Android.mk
deleted file mode 100644
index 79db8996f6b2..000000000000
--- a/utils/yaml-bench/Android.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
-
-
-yaml_bench_SRC_FILES := \
-  YAMLBench.cpp
-
-yaml_bench_STATIC_LIBRARIES := \
-  libLLVMSupport \
-
-# yaml-bench executable for the host
-# =====================================================
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := yaml-bench
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_IS_HOST_MODULE := true
-
-LOCAL_SRC_FILES := $(yaml_bench_SRC_FILES)
-
-LOCAL_STATIC_LIBRARIES := $(yaml_bench_STATIC_LIBRARIES)
-
-include $(LLVM_ROOT_PATH)/llvm.mk
-include $(LLVM_HOST_BUILD_MK)
-include $(BUILD_HOST_EXECUTABLE)