diff options
| author | Siarhei Vishniakou <svv@google.com> | 2018-07-06 11:50:18 +0100 |
|---|---|---|
| committer | Siarhei Vishniakou <svv@google.com> | 2018-07-11 09:56:43 +0100 |
| commit | 8027876f9f6d97aad280cd0f0da7739c46a314b6 (patch) | |
| tree | 1dcfc46703e30fb2fa7dc4ed03f622855fac75ea /tools/validatekeymaps | |
| parent | 89b325a9b9127a43a96be1df1992a84404217d23 (diff) | |
Refactor String8 to std::string calls
DisplayViewport::uniqueId is now std::string, so change the calls
appropriately. Do some additional cleanups and conversions.
This almost completely removes the dependency on String8.
Test: build only
Bug: 111108021
Change-Id: Ibbb6ca59e9061954d4a5fb930ef03d42cb0230db
Diffstat (limited to 'tools/validatekeymaps')
| -rw-r--r-- | tools/validatekeymaps/Android.bp | 1 | ||||
| -rw-r--r-- | tools/validatekeymaps/Main.cpp | 7 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/validatekeymaps/Android.bp b/tools/validatekeymaps/Android.bp index 6fb278c83f0a..819e75ba1fed 100644 --- a/tools/validatekeymaps/Android.bp +++ b/tools/validatekeymaps/Android.bp @@ -15,6 +15,7 @@ cc_binary_host { ], static_libs: [ + "libbase", "libinput", "libutils", "libcutils", diff --git a/tools/validatekeymaps/Main.cpp b/tools/validatekeymaps/Main.cpp index bbfcba6272b2..f31f771004bd 100644 --- a/tools/validatekeymaps/Main.cpp +++ b/tools/validatekeymaps/Main.cpp @@ -18,7 +18,6 @@ #include <input/KeyLayoutMap.h> #include <input/VirtualKeyMap.h> #include <utils/PropertyMap.h> -#include <utils/String8.h> #include <stdarg.h> #include <stdio.h> @@ -98,7 +97,7 @@ static bool validateFile(const char* filename) { case FILETYPE_KEYLAYOUT: { sp<KeyLayoutMap> map; - status_t status = KeyLayoutMap::load(String8(filename), &map); + status_t status = KeyLayoutMap::load(filename, &map); if (status) { error("Error %d parsing key layout file.\n\n", status); return false; @@ -108,7 +107,7 @@ static bool validateFile(const char* filename) { case FILETYPE_KEYCHARACTERMAP: { sp<KeyCharacterMap> map; - status_t status = KeyCharacterMap::load(String8(filename), + status_t status = KeyCharacterMap::load(filename, KeyCharacterMap::FORMAT_ANY, &map); if (status) { error("Error %d parsing key character map file.\n\n", status); @@ -130,7 +129,7 @@ static bool validateFile(const char* filename) { case FILETYPE_VIRTUALKEYDEFINITION: { VirtualKeyMap* map; - status_t status = VirtualKeyMap::load(String8(filename), &map); + status_t status = VirtualKeyMap::load(filename, &map); if (status) { error("Error %d parsing virtual key definition file.\n\n", status); return false; |