summaryrefslogtreecommitdiff
path: root/cmds/hid
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2019-03-28 22:31:35 -0700
committerColin Cross <ccross@android.com>2019-06-06 09:02:46 -0700
commit37d4c0054dc98ba8206957c3bcc242c79e9fc7b1 (patch)
tree3adfe8afe34faa15e95b53edf1b61034d8be126b /cmds/hid
parent985f1299cf8be14c0e4c121cc79df8498d9cf49d (diff)
Convert frameworks/base/cmds/* to Android.bp
See build/soong/README.md for more information. Also converts the rest of frameworks/base/tools/streaming_proto. Bug: 122332340 Test: m checkbuild Change-Id: I87c500c5464fb1722b4b518d89065f5e1ee29a97 (cherry picked from commit 45c0d71e774c84ec81392393a0fafad398d2838d)
Diffstat (limited to 'cmds/hid')
-rw-r--r--cmds/hid/Android.bp10
-rw-r--r--cmds/hid/Android.mk19
2 files changed, 9 insertions, 20 deletions
diff --git a/cmds/hid/Android.bp b/cmds/hid/Android.bp
index 2b7963aa9425..54c8bf3ef34c 100644
--- a/cmds/hid/Android.bp
+++ b/cmds/hid/Android.bp
@@ -1 +1,9 @@
-subdirs = ["jni"]
+// Copyright 2015 The Android Open Source Project
+//
+
+java_binary {
+ name: "hid",
+ wrapper: "hid",
+ srcs: ["**/*.java"],
+ required: ["libhidcommand_jni"],
+}
diff --git a/cmds/hid/Android.mk b/cmds/hid/Android.mk
deleted file mode 100644
index 574834dea31d..000000000000
--- a/cmds/hid/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2015 The Android Open Source Project
-#
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_MODULE := hid
-LOCAL_JNI_SHARED_LIBRARIES := libhidcommand_jni
-LOCAL_REQUIRED_MODULES := libhidcommand_jni
-include $(BUILD_JAVA_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := hid
-LOCAL_SRC_FILES := hid
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := EXECUTABLES
-include $(BUILD_PREBUILT)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))