aboutsummaryrefslogtreecommitdiffhomepage
path: root/platform_tools/android/app
diff options
context:
space:
mode:
authorGravatar djsollen <djsollen@google.com>2014-11-13 12:52:35 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2014-11-13 12:52:35 -0800
commit0b17d6cb343cb71a3f548a02f0952c3592fc8c87 (patch)
tree0a5577be50cfbd238db7008c7d73f7cc7b9e58a6 /platform_tools/android/app
parent04f7e14b385118b8caa3ad7fcb30d64f4c32e677 (diff)
Cleanup public includes directory.
This CL updates various files in the includes directory to ensure that (1) they do not depend on headers in /src and (2) that they minimize their dependence on external headers. To ensure that we don't regress this behavior a new build target has been added to build a single cpp file that contains all* public includes and is compiled with only those directories in the include path. * The exception is those includes that depend on OS specific headers BUG=skia:2941 NOTRY=true Review URL: https://codereview.chromium.org/721903002
Diffstat (limited to 'platform_tools/android/app')
-rw-r--r--platform_tools/android/app/jni/AndroidKeyToSkKey.h35
-rw-r--r--platform_tools/android/app/jni/com_skia_SkiaSampleRenderer.cpp2
2 files changed, 36 insertions, 1 deletions
diff --git a/platform_tools/android/app/jni/AndroidKeyToSkKey.h b/platform_tools/android/app/jni/AndroidKeyToSkKey.h
new file mode 100644
index 0000000000..6bcb148b46
--- /dev/null
+++ b/platform_tools/android/app/jni/AndroidKeyToSkKey.h
@@ -0,0 +1,35 @@
+
+/*
+ * Copyright 2011 Skia
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+
+#ifndef _ANDROID_TO_SKIA_KEYCODES_H
+#define _ANDROID_TO_SKIA_KEYCODES_H
+
+#include "android/keycodes.h"
+#include "SkKey.h"
+
+// Convert an Android keycode to an SkKey. This is an incomplete list, only
+// including keys used by the sample app.
+SkKey AndroidKeycodeToSkKey(int keycode) {
+ switch (keycode) {
+ case AKEYCODE_DPAD_LEFT:
+ return kLeft_SkKey;
+ case AKEYCODE_DPAD_RIGHT:
+ return kRight_SkKey;
+ case AKEYCODE_DPAD_UP:
+ return kUp_SkKey;
+ case AKEYCODE_DPAD_DOWN:
+ return kDown_SkKey;
+ case AKEYCODE_BACK:
+ return kBack_SkKey;
+ default:
+ return kNONE_SkKey;
+ }
+}
+
+#endif
diff --git a/platform_tools/android/app/jni/com_skia_SkiaSampleRenderer.cpp b/platform_tools/android/app/jni/com_skia_SkiaSampleRenderer.cpp
index da7c13d6ec..169670ad64 100644
--- a/platform_tools/android/app/jni/com_skia_SkiaSampleRenderer.cpp
+++ b/platform_tools/android/app/jni/com_skia_SkiaSampleRenderer.cpp
@@ -15,7 +15,7 @@
#include "SkWindow.h"
#include <jni.h>
-#include "android/AndroidKeyToSkKey.h"
+#include "AndroidKeyToSkKey.h"
///////////////////////////////////////////