Hook components/gcm_driver up to JNI Generator

components/gcm_driver.gypi

Index: components/gcm_driver.gypi
diff --git a/components/gcm_driver.gypi b/components/gcm_driver.gypi
index 489a710a88ae7bd51e2f5a04a68d645ffc47e04f..7ed86f8b17a74432a8f05786f0b354b485383f87 100644
--- a/components/gcm_driver.gypi
+++ b/components/gcm_driver.gypi
@@ -16,14 +16,54 @@
         '..',
       ],
       'sources': [
+        'gcm_driver/android/component_jni_registrar.cc',
+        'gcm_driver/android/component_jni_registrar.h',
         'gcm_driver/default_gcm_app_handler.cc',
         'gcm_driver/default_gcm_app_handler.h',
         'gcm_driver/gcm_app_handler.h',
         'gcm_driver/gcm_client_factory.cc',
         'gcm_driver/gcm_client_factory.h',
+        'gcm_driver/gcm_driver_android.cc',

[fgorski, 2014/05/15 17:38:02]

Will it be correct to build jni* and android* sources outside of Android?

[johnme, 2014/05/15 17:54:14]

Files whose path includes (^|/)android/ or that end in _android.cc don't get
built on Android, and the targets below are guarded by an OS=="android"
condition. So none of the changes to this GYP file have effect on desktop.

+        'gcm_driver/gcm_driver_android.h',
         'gcm_driver/system_encryptor.cc',
         'gcm_driver/system_encryptor.h',
       ],
+      'conditions': [
+        ['OS == "android"', {
+          'dependencies': [
+            'gcm_driver_jni_headers',
+          ],
+        }],
+      ],
     },
   ],
+  'conditions': [
+    ['OS=="android"', {

[jianli, 2014/05/15 18:13:39]

nit: space before and after '=='

[johnme, 2014/05/15 19:29:42]

Done (though technically, no spaces is 3x more common in the codebase).

+      'targets': [
+        {
+          'target_name': 'gcm_driver_java',
+          'type': 'none',
+          'dependencies': [
+            '../base/base.gyp:base',
+          ],
+          'variables': {
+            'java_in_dir': 'gcm_driver/android/java',
+          },
+          'includes': [ '../build/java.gypi' ],
+        },
+        {
+          'target_name': 'gcm_driver_jni_headers',
+          'type': 'none',
+          'sources': [
+            'gcm_driver/android/java/src/org/chromium/components/gcm_driver/GCMDriver.java',
+          ],
+          'variables': {
+            'jni_gen_package': 'components/gcm_driver',
+          },
+          'includes': [ '../build/jni_generator.gypi' ],
+        },
+      ],
+     },
+    ],
+  ],
 }