summaryrefslogtreecommitdiff
path: root/tools/validatekeymaps
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2017-09-08 22:47:47 -0700
committerDan Willemsen <dwillemsen@google.com>2017-09-09 06:18:48 +0000
commitd3eac266b02399a8a822517e844c05585879221a (patch)
tree9d6cefd142dd515c9e3ad946f6549f9727822c8e /tools/validatekeymaps
parent1cb5ab2dc14fb35359525479a7c7356d84904ce1 (diff)
Convert host tools to Android.bp
See build/soong/README.md for more information. Test: m libinstrumentation interrupter accessorychat accessorytest bit obbtool pbkdf2gen libsplit-select_tests split-select protoc-gen-javastream validatekeymaps libaapt_tests aapt Test: mmma frameworks/base Test: out/host/linux-x86/nativetest64/libaapt_tests/libaapt_tests Test: out/host/linux-x86/nativetest64/libsplit-select_tests/libsplit-select_tests Change-Id: I93cf24d4b232353a52d53be8ed85781b8f4a3877
Diffstat (limited to 'tools/validatekeymaps')
-rw-r--r--tools/validatekeymaps/Android.bp30
-rw-r--r--tools/validatekeymaps/Android.mk33
2 files changed, 30 insertions, 33 deletions
diff --git a/tools/validatekeymaps/Android.bp b/tools/validatekeymaps/Android.bp
new file mode 100644
index 000000000000..6fb278c83f0a
--- /dev/null
+++ b/tools/validatekeymaps/Android.bp
@@ -0,0 +1,30 @@
+//
+// Copyright 2010 The Android Open Source Project
+//
+// Keymap validation tool.
+//
+
+cc_binary_host {
+ name: "validatekeymaps",
+
+ srcs: ["Main.cpp"],
+
+ cflags: [
+ "-Wall",
+ "-Werror",
+ ],
+
+ static_libs: [
+ "libinput",
+ "libutils",
+ "libcutils",
+ "liblog",
+ ],
+
+ // This tool is prebuilt if we're doing an app-only build.
+ product_variables: {
+ unbundled_build: {
+ enabled: false,
+ },
+ },
+}
diff --git a/tools/validatekeymaps/Android.mk b/tools/validatekeymaps/Android.mk
deleted file mode 100644
index 9af721de97db..000000000000
--- a/tools/validatekeymaps/Android.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Copyright 2010 The Android Open Source Project
-#
-# Keymap validation tool.
-#
-
-# This tool is prebuilt if we're doing an app-only build.
-ifeq ($(TARGET_BUILD_APPS),)
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
- Main.cpp
-
-LOCAL_CFLAGS := -Wall -Werror
-
-LOCAL_STATIC_LIBRARIES := \
- libinput \
- libutils \
- libcutils \
- liblog
-
-ifeq ($(HOST_OS),linux)
-LOCAL_LDLIBS += -ldl -lpthread
-endif
-
-LOCAL_MODULE := validatekeymaps
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_HOST_EXECUTABLE)
-
-endif # TARGET_BUILD_APPS