release-request-2fc80fb4-5a6a-4db9-97b2-5d042a5af5cf-for-git_oc-dr1-release-4038177 snap-temp-L01900000067217063android-8.0.0_r34android-8.0.0_r33android-8.0.0_r27android-8.0.0_r26android-8.0.0_r25android-8.0.0_r24android-8.0.0_r23android-8.0.0_r22android-8.0.0_r21oreo-dr3-releaseoreo-dr2-releaseoreo-dr1-release

Change-Id: I85532eda6f74918a6c131548288b7b7463559668

2 files changed, 23 insertions, 29 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..b09fd43
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,23 @@
+cc_library_static {
+    name: "libvterm",
+
+    export_include_dirs: ["include"],
+
+    srcs: [
+        "src/input.c",
+        "src/vterm.c",
+        "src/encoding.c",
+        "src/parser.c",
+        "src/unicode.c",
+        "src/pen.c",
+        "src/screen.c",
+        "src/state.c",
+    ],
+
+    cflags: [
+        "-std=c99",
+        "-Wno-missing-field-initializers",
+        "-Wno-sign-compare",
+        "-Wno-unused-parameter",
+    ],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index dac5231..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libvterm
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_C_INCLUDES += \
-    $(LOCAL_PATH)/include
-
-LOCAL_SRC_FILES := \
-    src/input.c \
-    src/vterm.c \
-    src/encoding.c \
-    src/parser.c \
-    src/unicode.c \
-    src/pen.c \
-    src/screen.c \
-    src/state.c
-
-LOCAL_CFLAGS += \
-    -std=c99 \
-    -Wno-missing-field-initializers \
-    -Wno-sign-compare \
-    -Wno-unused-parameter \
-
-LOCAL_CLANG := true
-
-include $(BUILD_STATIC_LIBRARY)