Gamepad API for Android

content/content.gyp

Index: content/content.gyp
diff --git a/content/content.gyp b/content/content.gyp
index 1d323520b14605031ec98980d038476598d352c6..6ef20f8da7f2908375292cff51f7d2f97b42de4b 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -125,6 +125,7 @@
             }],
             ['OS=="android"', {
               'dependencies': [
+                'content_gamepad_mapping',
                 'content_gpu',
                 'content_utility',
               ],
@@ -499,6 +500,22 @@
           ],
           'includes': [ 'content_jni.gypi' ],
         },
+        {
+          'target_name': 'content_gamepad_mapping',

[boliu, 2014/03/10 18:27:04]

This will need changes in android_webview/all_webview.gyp and
LOCAL_GENERATED_SOURCES in android_webview/Android.mk

[kbalazs, 2014/03/12 00:17:36]

I moved it to be a dependency for content_java. Do you think it is enough for
the webview? Also edited Android.mk

[boliu, 2014/03/12 00:58:46]

No (but you should add it to content_java regardless)

So android webview, when built inside the android tree, doesn't use gyp to build
any java *source* files. It's built in one step by android_webview/Android.mk;
look at the LOCAL_SRC_FILES variable.

The issue is this is not a java source file, but that it's generating a source
file. So we have to keep a list of these in android_webview/all_webview.gyp. The
android_aosp bot will catch this. I'm only giving you a heads up.

+          'type': 'none',
+          'sources': [
+            'public/android/java/src/org/chromium/content/browser/input/gamepad_mapping/CanonicalButtonIndex.template',
+            'public/android/java/src/org/chromium/content/browser/input/gamepad_mapping/CanonicalAxisIndex.template',
+          ],
+          'variables': {
+            'package_name': 'org/chromium/content/browser/input/gamepad_mapping',
+            'template_deps': [
+              'browser/gamepad/canonical_axis_index_list.h',
+              'browser/gamepad/canonical_button_index_list.h',
+            ],
+          },
+          'includes': [ '../build/android/java_cpp_template.gypi' ],
+        },
       ],
     }],  # OS == "android"
   ],