From e71d9d40b5b66d646f80081abea9893d3e0fdf59 Mon Sep 17 00:00:00 2001
From: Steven Moreland <smoreland@google.com>
Date: Wed, 17 May 2017 11:49:24 -0700
Subject: libjni_terminal: Android.mk -> Android.bp

Note: removed include dirs:
- frameworks/base/include doesn't exist
- external/libvterm/include is now properly exported

Test: links
Change-Id: Ibcea0bc2ffe17180d55a5f5b534f05dc3a52fe9f
---
 Android.bp     |  3 +++
 jni/Android.bp | 20 ++++++++++++++++++++
 jni/Android.mk | 29 -----------------------------
 3 files changed, 23 insertions(+), 29 deletions(-)
 create mode 100644 Android.bp
 create mode 100644 jni/Android.bp
 delete mode 100644 jni/Android.mk

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..726a790
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,3 @@
+subdirs = [
+    "jni",
+]
diff --git a/jni/Android.bp b/jni/Android.bp
new file mode 100644
index 0000000..f5ed6a7
--- /dev/null
+++ b/jni/Android.bp
@@ -0,0 +1,20 @@
+cc_library_shared {
+    name: "libjni_terminal",
+
+    srcs: [
+        "jni_init.cpp",
+        "com_android_terminal_Terminal.cpp",
+    ],
+
+    shared_libs: [
+        "libandroidfw",
+        "libandroid_runtime",
+        "liblog",
+        "libnativehelper",
+        "libutils",
+    ],
+
+    static_libs: ["libvterm"],
+
+    cflags: ["-Wno-unused-parameter"],
+}
diff --git a/jni/Android.mk b/jni/Android.mk
deleted file mode 100644
index 338ab3e..0000000
--- a/jni/Android.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-    jni_init.cpp \
-    com_android_terminal_Terminal.cpp \
-
-LOCAL_C_INCLUDES += \
-    external/libvterm/include \
-    frameworks/base/include
-
-LOCAL_SHARED_LIBRARIES := \
-    libandroidfw \
-    libandroid_runtime \
-    liblog \
-    libnativehelper \
-    libutils
-
-LOCAL_STATIC_LIBRARIES := \
-    libvterm
-
-LOCAL_CFLAGS := \
-    -Wno-unused-parameter \
-
-LOCAL_MODULE := libjni_terminal
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_SHARED_LIBRARY)
-- 
cgit v1.2.3