Splits components/sessions into separate core and content targets.

components/sessions.gypi

Index: components/sessions.gypi
diff --git a/components/sessions.gypi b/components/sessions.gypi
index f05d028e6e1b1241474699486d87b5a79acac9eb..f396e03dd50d7237bcc0421e87eb985ba561cd01 100644
--- a/components/sessions.gypi
+++ b/components/sessions.gypi
@@ -3,55 +3,100 @@
 # found in the LICENSE file.
 
 {
-  'targets': [
-    {
-      # GN version: //components/sessions
-      'target_name': 'sessions',
-      'type': '<(component)',
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '../content/content.gyp:content_browser',
-        '../skia/skia.gyp:skia',
-        '../third_party/protobuf/protobuf.gyp:protobuf_lite',
-        '../ui/base/ui_base.gyp:ui_base',
-        '../url/url.gyp:url_lib',
-      ],
-      'include_dirs': [
-        '..',
+  'conditions': [
+    ['component=="static_library"', {
+      'targets': [
+        {
+          # GN version: //components/sessions:sessions
+          'target_name': 'sessions',
+          'type': 'none',

[blundell, 2014/10/24 07:23:13]

I don't understand the use of 'none' here.

+          'dependencies': [
+            'sessions_core',
+          ],
+          'conditions': [
+            ['OS!="ios"', {
+              'dependencies': [
+                'sessions_content',
+              ],
+            }],
+          ],
+        },
+        {
+          # GN version: //components/sessions:sessions_core
+          'target_name': 'sessions_core',
+          'type': 'static_library',
+          'includes': [
+            'sessions/sessions_core.gypi',
+          ],
+        },
       ],
-      'defines': [
-        'SESSIONS_IMPLEMENTATION',
+      'conditions': [
+        ['OS!="ios"', {
+          'targets': [
+            {
+              # GN version: //components/sessions:sessions_content
+              'target_name': 'sessions_content',
+              'type': 'static_library',
+              'includes': [
+                'sessions/sessions_content.gypi',
+              ],
+              'dependencies': [
+                'sessions_core',
+              ],
+            },
+          ],
+        }],
       ],
-      'sources': [
-        # Note: sources list duplicated in GN build.
-
-        # TODO(rohitrao): Split this target into three separate core, content,
-        # and web targets.
-        'sessions/content/content_serialized_navigation_builder.cc',
-        'sessions/content/content_serialized_navigation_builder.h',
-        'sessions/content/content_serialized_navigation_driver.cc',
-        'sessions/content/content_serialized_navigation_driver.h',
-        'sessions/core/serialized_navigation_driver.h',
-        'sessions/serialized_navigation_entry.cc',
-        'sessions/serialized_navigation_entry.h',
-        'sessions/session_id.cc',
-        'sessions/session_id.h',
+    }, {  # component=="static_library"

[blundell, 2014/10/24 07:23:13]

s/static_library/shared_library

+      'targets': [
+        {
+          # GN version: //components/sessions:sessions
+          'target_name': 'sessions',
+          'type': 'shared_library',
+          'includes': [
+            'sessions/sessions_core.gypi',
+          ],
+          'conditions': [
+            ['OS!="ios"', {
+              'includes': [
+                'sessions/sessions_content.gypi',
+              ],
+            }],
+          ],
+        },
+        {
+          # GN version: //components/sessions:sessions_core
+          'target_name': 'sessions_core',
+          'type': 'none',

[blundell, 2014/10/24 07:23:13]

I don't understand the use of 'none' here.

[rohitrao (ping after 24h), 2014/10/24 12:18:29]

I think this is how the GYP file is structured:

In the shared_library build, there can only be one top-level library for
sessions.  We accomplish that by moving the sources/dependency lists into gypi
files and including them all into one giant "sessions" target.

Other gyp files (such as chrome_browser.gypi) will still have dependencies onto
"sessions_core" and "sessions_content," however.  We handle those by defining
dummy targets of type "none" that simply redirect to the one main target.

In the static_library build, the "sessions_core" and "sessions_content" targets
can be implemented as we normally would, albeit using gypi files for the guts. 
We also define a dummy "sessions" target for symmetry, although I think we might
be able to get away without having that.

+          'dependencies': [
+            'sessions',
+          ],
+        },
       ],
       'conditions': [
-        ['android_webview_build == 0', {
-          'dependencies': [
-             '../sync/sync.gyp:sync',
-          ]
+        ['OS!="ios"', {
+          'targets': [
+            {
+              # GN version: //components/sessions:sessions_content
+              'target_name': 'sessions_content',
+              'type': 'none',
+              'dependencies': [
+                'sessions',
+              ],
+            },
+          ],
         }],
       ],
-    },
+    }],
+  ],
+  'targets': [
     {
       # GN version: //components/sessions:test_support
       'target_name': 'sessions_test_support',
       'type': 'static_library',
       'defines!': ['SESSIONS_IMPLEMENTATION'],
       'dependencies': [
+        'sessions_core',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
       ],
@@ -73,3 +118,6 @@
     },
   ],
 }
+

[blundell, 2014/10/24 07:23:13]

kill

+
+