diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-09-10 02:15:34 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-10 02:15:34 +0000 |
| commit | 116abe23c4cbef3556f3fac756eb76d64fda365d (patch) | |
| tree | 1302e4cbae8bfef1f153ec1e517ac07587e526d1 /tools/validatekeymaps | |
| parent | 72de72c1194a86cc72eb73dd662e43a1f72e10f4 (diff) | |
| parent | 2e9ec5f0de4c69cd97640ae9de38da84f9352f21 (diff) | |
Merge changes I93cf24d4,I32e438ef am: 30798ad13a am: c28d591b36 am: 59225490b8
am: 2e9ec5f0de
Change-Id: Ie590c34bce9d0218bb9b48294756dae04e9210b7
Diffstat (limited to 'tools/validatekeymaps')
| -rw-r--r-- | tools/validatekeymaps/Android.bp | 30 | ||||
| -rw-r--r-- | tools/validatekeymaps/Android.mk | 33 |
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 |