From 8119ffa2993ec30f821b53648a239d75e342bcb2 Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Fri, 8 Sep 2017 23:23:59 -0700
Subject: Convert libhidcommand_jni to Android.bp

See build/soong/README.md for more information.

Test: m libhidcommand_jni
Change-Id: Ica144979a2f89e0a9ed8eb4a816024aa318043e6
---
 cmds/hid/Android.bp     |  1 +
 cmds/hid/jni/Android.bp | 17 +++++++++++++++++
 cmds/hid/jni/Android.mk | 18 ------------------
 3 files changed, 18 insertions(+), 18 deletions(-)
 create mode 100644 cmds/hid/Android.bp
 create mode 100644 cmds/hid/jni/Android.bp
 delete mode 100644 cmds/hid/jni/Android.mk

diff --git a/cmds/hid/Android.bp b/cmds/hid/Android.bp
new file mode 100644
index 000000000000..2b7963aa9425
--- /dev/null
+++ b/cmds/hid/Android.bp
@@ -0,0 +1 @@
+subdirs = ["jni"]
diff --git a/cmds/hid/jni/Android.bp b/cmds/hid/jni/Android.bp
new file mode 100644
index 000000000000..095cfc6ceb53
--- /dev/null
+++ b/cmds/hid/jni/Android.bp
@@ -0,0 +1,17 @@
+cc_library_shared {
+    name: "libhidcommand_jni",
+
+    srcs: ["com_android_commands_hid_Device.cpp"],
+
+    shared_libs: [
+        "libandroid",
+        "liblog",
+        "libnativehelper",
+    ],
+
+    cflags: [
+        "-Wall",
+        "-Wextra",
+        "-Werror",
+    ],
+}
diff --git a/cmds/hid/jni/Android.mk b/cmds/hid/jni/Android.mk
deleted file mode 100644
index 86f4e012a943..000000000000
--- a/cmds/hid/jni/Android.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-    com_android_commands_hid_Device.cpp
-
-LOCAL_C_INCLUDES := \
-    $(JNI_H_INCLUDE)
-
-LOCAL_LDLIBS += -landroid -llog -lnativehelper
-
-LOCAL_MODULE := libhidcommand_jni
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_CFLAGS += -Wall -Wextra -Werror
-
-include $(BUILD_SHARED_LIBRARY)
-- 
cgit v1.2.3-59-g8ed1b