summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-05-24 07:26:30 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-05-24 07:26:30 +0000
commitf621d95c9dc8a2ff3a54ed6fa34c4275381b8b5a (patch)
tree0a84e6f14293701f0a69830e098efaa99f065153
parent79b9ef2730ff0acbba9eb4d14d3592e7f2e25e3d (diff)
parentfba9f637da918feeadab930b9f2d8bddb7542220 (diff)
downloadandroid_packages_apps_Terminal-staging/lineage-15.0_rebase-android-8.0.0_r23.tar.gz
android_packages_apps_Terminal-staging/lineage-15.0_rebase-android-8.0.0_r23.tar.bz2
android_packages_apps_Terminal-staging/lineage-15.0_rebase-android-8.0.0_r23.zip
release-request-2fc80fb4-5a6a-4db9-97b2-5d042a5af5cf-for-git_oc-dr1-release-4038177 snap-temp-L01900000067217063staging/lineage-15.0_rebase-android-8.0.0_r23
Change-Id: I47dd060e0e58c6b190f285dcb3677628c9b942c7
-rw-r--r--Android.bp3
-rw-r--r--jni/Android.bp20
-rw-r--r--jni/Android.mk29
3 files changed, 23 insertions, 29 deletions
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)