Convert libutf to Android.bp

am: 7d29531067

Change-Id: I4ff4c66ca7e2c8013b05e90473d0b9030775c4ee

2 files changed, 40 insertions, 37 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..ccf4cee
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,40 @@
+// We only build the static library at the moment.
+cc_library_static {
+    name: "libutf",
+    srcs: [
+        "rune.c",
+        "runestrcat.c",
+        "runestrchr.c",
+        "runestrcmp.c",
+        "runestrcpy.c",
+        "runestrdup.c",
+        "runestrlen.c",
+        "runestrecpy.c",
+        "runestrncat.c",
+        "runestrncmp.c",
+        "runestrncpy.c",
+        "runestrrchr.c",
+        "runestrstr.c",
+        "runetype.c",
+        "utfecpy.c",
+        "utflen.c",
+        "utfnlen.c",
+        "utfrrune.c",
+        "utfrune.c",
+        "utfutf.c",
+    ],
+    cflags: [
+        "-O3",
+        "-Wall",
+        "-Wno-missing-braces",
+        "-Wno-parentheses",
+        "-Wno-switch",
+    ],
+    export_include_dirs: ["."],
+    arch: {
+        arm: {
+            instruction_set: "arm",
+        },
+    },
+    sdk_version: "14",
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 887a1ab..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-utf_src := \
-    rune.c \
-    runestrcat.c \
-    runestrchr.c \
-    runestrcmp.c \
-    runestrcpy.c \
-    runestrdup.c \
-    runestrlen.c \
-    runestrecpy.c \
-    runestrncat.c \
-    runestrncmp.c \
-    runestrncpy.c \
-    runestrrchr.c \
-    runestrstr.c \
-    runetype.c \
-    utfecpy.c \
-    utflen.c \
-    utfnlen.c \
-    utfrrune.c \
-    utfrune.c \
-    utfutf.c
-
-utf_cflags := -Wall -Wno-missing-braces -Wno-parentheses -Wno-switch
-
-# We only build the static library at the moment.
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libutf
-LOCAL_SRC_FILES := $(utf_src)
-LOCAL_CFLAGS += -O3 $(utf_cflags)
-LOCAL_ARM_MODE := arm
-LOCAL_SDK_VERSION := 14
-
-include $(BUILD_STATIC_LIBRARY)
-