Massive refactor of the Android invalidation code.

components/invalidation.gypi

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       # GN version: //components/invalidation
       'target_name': 'invalidation',
       'type': 'static_library',
@@ skipping 24 matching lines @@
         'invalidation/invalidation.cc',
         'invalidation/invalidation.h',
         'invalidation/invalidation_handler.cc',
         'invalidation/invalidation_handler.h',
         'invalidation/invalidation_logger.cc',
         'invalidation/invalidation_logger.h',
         'invalidation/invalidation_logger_observer.h',
         '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',
         'invalidation/invalidation_state_tracker.h',
         'invalidation/invalidation_switches.cc',
         'invalidation/invalidation_switches.h',
         'invalidation/invalidation_util.cc',
         'invalidation/invalidation_util.h',
         'invalidation/invalidator.cc',
         'invalidation/invalidator.h',
@@ skipping 39 matching lines @@
               'invalidation/sync_invalidation_listener.cc',
               'invalidation/sync_invalidation_listener.h',
               'invalidation/sync_system_resources.cc',
               'invalidation/sync_system_resources.h',
               'invalidation/ticl_invalidation_service.cc',
               'invalidation/ticl_invalidation_service.h',
               'invalidation/ticl_settings_provider.cc',
               'invalidation/ticl_settings_provider.h',
             ],
           }],
+        ['OS == "android"', {
+          'dependencies': [
+            'invalidation_jni_headers',
+          ],
+          'sources': [
+            'invalidation/android/component_jni_registrar.cc',
+            'invalidation/android/component_jni_registrar.h',
+          ],
+        }],
       ],
     },
 
     {
       # GN version: //components/invalidation:test_support
       'target_name': 'invalidation_test_support',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../google_apis/google_apis.gyp:google_apis',
@@ skipping 10 matching lines @@
         '..',
       ],
       'sources': [
         # Note: sources list duplicated in GN build.
         'invalidation/fake_invalidation_handler.cc',
         'invalidation/fake_invalidation_handler.h',
         'invalidation/fake_invalidation_state_tracker.cc',
         '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',
         'invalidation/invalidation_test_util.h',
         'invalidation/invalidator_test_template.cc',
         'invalidation/invalidator_test_template.h',
         'invalidation/object_id_invalidation_map_test_util.cc',
         'invalidation/object_id_invalidation_map_test_util.h',
         'invalidation/unacked_invalidation_set_test_util.cc',
         'invalidation/unacked_invalidation_set_test_util.h',
       ],
       'conditions': [
           ['OS != "android"', {
             'sources': [
               # Note: sources list duplicated in GN build.
               'invalidation/p2p_invalidation_service.cc',
               'invalidation/p2p_invalidation_service.h',
             ],
           }],
       ],
     },
   ],
+  'conditions': [
+    ['OS == "android"', {
+      'targets': [
+        {
+          'target_name': 'invalidation_java',
+          'type': 'none',
+          'dependencies': [

[nyquist, 2014/09/04 09:01:56]

Doesn't this also depend on the cacheinvalidation_javalib target?

[maxbogue, 2014/09/05 16:42:45]

Done.

+            '../base/base.gyp:base',
+            '../sync/sync.gyp:sync_java',

[nyquist, 2014/09/04 09:01:56]

In the future, would this go away? I think we should aim towards that going
forward.
There will always be the class ModelType, so somewhere there needs to be some
kind of conversion, but preferably, this component should not depend on //sync.

[maxbogue, 2014/09/05 16:42:45]

I agree that it's preferable to not depend on //sync, but for now it's fine.

+          ],
+          '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' ],
+        },
+      ],
+     },
+    ],
+  ],
 }