diff options
| author | Steven Moreland <smoreland@google.com> | 2017-05-23 18:10:20 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-23 18:10:20 +0000 |
| commit | fba9f637da918feeadab930b9f2d8bddb7542220 (patch) | |
| tree | 0a84e6f14293701f0a69830e098efaa99f065153 | |
| parent | 79b9ef2730ff0acbba9eb4d14d3592e7f2e25e3d (diff) | |
| parent | 9825e261954480c40e44272ad43b89e0ff2cca2b (diff) | |
| download | android_packages_apps_Terminal-fba9f637da918feeadab930b9f2d8bddb7542220.tar.gz android_packages_apps_Terminal-fba9f637da918feeadab930b9f2d8bddb7542220.tar.bz2 android_packages_apps_Terminal-fba9f637da918feeadab930b9f2d8bddb7542220.zip | |
libjni_terminal: Android.mk -> Android.bp am: e71d9d40b5 am: 8cf75ff36c am: f1fac4738b
am: 9825e26195
Change-Id: I51cdb1e07d91395f616e024ff6e2ff333848e7d2
| -rw-r--r-- | Android.bp | 3 | ||||
| -rw-r--r-- | jni/Android.bp | 20 | ||||
| -rw-r--r-- | jni/Android.mk | 29 |
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) |