Massive refactor of the Android invalidation code.

components/invalidation.gypi

Index: components/invalidation.gypi
diff --git a/components/invalidation.gypi b/components/invalidation.gypi
index 3da96511bd131a33c7f9ba928c7b99af6961edf8..2996d04047f88edd86749f17a0aeb2916c4d5360 100644
--- a/components/invalidation.gypi
+++ b/components/invalidation.gypi
@@ -42,6 +42,8 @@
         'invalidation/invalidation_prefs.cc',
         'invalidation/invalidation_prefs.h',
         'invalidation/invalidation_service.h',
+        'invalidation/invalidation_service_android.cc',
+        'invalidation/invalidation_service_android.h',
         'invalidation/invalidation_service_util.cc',
         'invalidation/invalidation_service_util.h',
         'invalidation/invalidation_state_tracker.cc',
@@ -101,6 +103,15 @@
               'invalidation/ticl_settings_provider.h',
             ],
           }],
+        ['OS == "android"', {
+          'dependencies': [
+            'invalidation_jni_headers',
+          ],
+          'sources': [
+            'invalidation/android/component_jni_registrar.cc',
+            'invalidation/android/component_jni_registrar.h',
+          ],
+        }],
       ],
     },
 
@@ -131,6 +142,7 @@
         'invalidation/fake_invalidation_state_tracker.h',
         'invalidation/fake_invalidator.cc',
         'invalidation/fake_invalidator.h',
+        'invalidation/invalidation_service_android_unittest.cc',
         'invalidation/invalidation_service_test_template.cc',
         'invalidation/invalidation_service_test_template.h',
         'invalidation/invalidation_test_util.cc',
@@ -153,4 +165,35 @@
       ],
     },
   ],
+  'conditions': [

[nyquist, 2014/09/10 18:25:04]

add invalidation_javatests. see for example
//sync/sync_tests.gypi:sync_javatests

[maxbogue, 2014/09/11 20:08:08]

Done. I added it in chrome/chrome.gyp too; hopefully I found the right place for
it but I'm not sure.

+    ['OS == "android"', {
+      'targets': [
+        {
+          'target_name': 'invalidation_java',
+          'type': 'none',
+          'dependencies': [
+            '../base/base.gyp:base',
+            '../sync/sync.gyp:sync_java',
+            '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_javalib',
+          ],
+          'variables': {
+            'java_in_dir': 'invalidation/android/java',
+          },
+          'includes': [ '../build/java.gypi' ],
+        },
+        {
+          'target_name': 'invalidation_jni_headers',
+          'type': 'none',
+          'sources': [
+            'invalidation/android/java/src/org/chromium/components/invalidation/InvalidationService.java',
+          ],
+          'variables': {
+            'jni_gen_package': 'components/invalidation',
+          },
+          'includes': [ '../build/jni_generator.gypi' ],
+        },
+      ],
+     },
+    ],
+  ],
 }