diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-09-09 19:53:11 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-09 19:53:11 +0000 |
| commit | c80623a641c5b633b077bea2d7f2e2aeae7bf020 (patch) | |
| tree | 84aa2243b5fae24ec25bbe081b4062ac4f1746ab /cmds/hid | |
| parent | fa5923157ff0efc3d2adaf18337ac246ae224694 (diff) | |
| parent | f1ae466af8988d82e884dfcf126a1a8a24f36ffe (diff) | |
Merge "Convert libhidcommand_jni to Android.bp" into stage-aosp-master am: a97f4d4ac3 am: 21d5fdbbce
am: f1ae466af8
Change-Id: I5a1c6df3f934706753f72718b2ca5d37add84ca3
Diffstat (limited to 'cmds/hid')
| -rw-r--r-- | cmds/hid/Android.bp | 1 | ||||
| -rw-r--r-- | cmds/hid/jni/Android.bp | 17 | ||||
| -rw-r--r-- | cmds/hid/jni/Android.mk | 18 |
3 files changed, 18 insertions, 18 deletions
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) |