Implement InstanceIDAndroid using InstanceIDWithSubtype.java

components/gcm_driver.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/gcm_driver/common
       'target_name': 'gcm_driver_common',
       'type': '<(component)',
@@ skipping 157 matching lines @@
     },
     {
       # GN version: //components/gcm_driver/instance_id
       'target_name': 'instance_id',
       'type': 'static_library',
       'include_dirs': [
         '..',
       ],
       'sources': [
         # Note: file list duplicated in GN build.
+        'gcm_driver/instance_id/android/component_jni_registrar.cc',
+        'gcm_driver/instance_id/android/component_jni_registrar.h',
         'gcm_driver/instance_id/instance_id.cc',
         'gcm_driver/instance_id/instance_id.h',
         'gcm_driver/instance_id/instance_id_android.cc',
         'gcm_driver/instance_id/instance_id_android.h',
         'gcm_driver/instance_id/instance_id_driver.cc',
         'gcm_driver/instance_id/instance_id_driver.h',
         'gcm_driver/instance_id/instance_id_impl.cc',
         'gcm_driver/instance_id/instance_id_impl.h',
       ],
       'conditions': [
         ['OS == "android"', {
+          'dependencies': [
+            'instance_id_driver_jni_headers',
+          ],
           'sources!': [
             'gcm_driver/instance_id/instance_id_impl.cc',
             'gcm_driver/instance_id/instance_id_impl.h',
           ],
         }],
       ],
     },
     {
       # GN version: //components/gcm_driver/instance_id:test_support
       'target_name': 'instance_id_test_support',
@@ skipping 94 matching lines @@
     },
   ],
   'conditions': [
     ['OS == "android"', {
       'targets': [
         {
           # GN version: //components/gcm_driver/android:gcm_driver_java
           'target_name': 'gcm_driver_java',
           'type': 'none',
           'dependencies': [
-            '../base/base.gyp:base',
-            # TODO(johnme): Fix the layering violation of depending on content/
+            '../base/base.gyp:base_java',
             '../content/content.gyp:content_java',
             '../sync/sync.gyp:sync_java',
           ],
           'variables': {
             'java_in_dir': 'gcm_driver/android/java',
           },
           'includes': [ '../build/java.gypi' ],
         },
         {
           # GN version: //components/gcm_driver/android:jni_headers
           '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' ],
         },
+        {
+          # GN version: //components/gcm_driver/instance_id/android:instance_id_driver_java
+          'target_name': 'instance_id_driver_java',
+          'type': 'none',
+          'dependencies': [
+            '../base/base.gyp:base_java',
+          ],
+          'variables': {
+            'java_in_dir': 'gcm_driver/instance_id/android/java',
+          },
+          'includes': [ '../build/java.gypi' ],
+        },
+        {
+          # GN version: //components/gcm_driver/instance_id/android:jni_headers
+          'target_name': 'instance_id_driver_jni_headers',
+          'type': 'none',
+          'sources': [
+            'gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java',
+          ],
+          'variables': {
+            'jni_gen_package': 'components/gcm_driver/instance_id',
+          },
+          'includes': [ '../build/jni_generator.gypi' ],
+        },
       ],
      },
     ],
   ],
 }