Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / components / sessions.gypi

diff --git a/src/components/sessions.gypi b/src/components/sessions.gypi
index 2da33d7..40c103d 100644 (file)
--- a/src/components/sessions.gypi
+++ b/src/components/sessions.gypi
@@ -3,41 +3,26 @@
 # found in the LICENSE file.
 
 {
+  'variables': {
+    # Core sources shared by sessions_content and sessions_ios.
+    #
+    # TODO(rohitrao): We are including these sources directly into each
+    # individual target in order to avoid the complications associated with
+    # making a separate sessions_core target.  The files in sessions/core
+    # declare a static function that they do not define, which means that a
+    # sessions_core target would not link as a shared_library.  It would also be
+    # unsuitable as a static_library because it would be linked into multiple
+    # shared libraries.  Revisit this setup if necessary.
+    'sessions_core_sources': [
+      'sessions/core/serialized_navigation_driver.h',
+      'sessions/serialized_navigation_entry.cc',
+      'sessions/serialized_navigation_entry.h',
+      'sessions/session_id.cc',
+      'sessions/session_id.h',
+    ],
+  },
   'targets': [
     {
-      # GN version: //components/sessions
-      'target_name': 'sessions',
-      'type': '<(component)',
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../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': [
-        '..',
-      ],
-      'defines': [
-        'SESSIONS_IMPLEMENTATION',
-      ],
-      'sources': [
-        # Note: sources list duplicated in GN build.
-        'sessions/serialized_navigation_entry.cc',
-        'sessions/serialized_navigation_entry.h',
-        'sessions/session_id.cc',
-        'sessions/session_id.h',
-      ],
-      'conditions': [
-        ['android_webview_build == 0', {
-          'dependencies': [
-             '../sync/sync.gyp:sync',
-          ]
-        }],
-      ],
-    },
-    {
       # GN version: //components/sessions:test_support
       'target_name': 'sessions_test_support',
       'type': 'static_library',
@@ -63,4 +48,78 @@
       ],
     },
   ],
+
+  # Platform-specific targets.
+  'conditions': [
+    ['OS!="ios"', {
+      'targets': [
+       {
+         # GN version: //components/sessions:sessions_content
+         'target_name': 'sessions_content',
+         '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': [
+           '..',
+         ],
+         'defines': [
+           'SESSIONS_IMPLEMENTATION',
+         ],
+         'sources': [
+           # Note: sources list duplicated in GN build.
+           '<@(sessions_core_sources)',
+
+           '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',
+         ],
+         'conditions': [
+           ['android_webview_build == 0', {
+             'dependencies': [
+                '../sync/sync.gyp:sync',
+             ]
+           }],
+         ],
+       },
+      ],
+    }, {  # OS==ios
+      'targets': [
+       {
+         'target_name': 'sessions_ios',
+         'type': 'static_library',
+         'dependencies': [
+           '../base/base.gyp:base',
+            '../ios/web/ios_web.gyp:ios_web',
+            '../sync/sync.gyp:sync',
+           '../third_party/protobuf/protobuf.gyp:protobuf_lite',
+           '../ui/base/ui_base.gyp:ui_base',
+           '../url/url.gyp:url_lib',
+         ],
+         'include_dirs': [
+           '..',
+         ],
+         'defines': [
+           'SESSIONS_IMPLEMENTATION',
+         ],
+         'sources': [
+           '<@(sessions_core_sources)',
+
+           'sessions/ios/ios_serialized_navigation_builder.cc',
+           'sessions/ios/ios_serialized_navigation_builder.h',
+           'sessions/ios/ios_serialized_navigation_driver.cc',
+           'sessions/ios/ios_serialized_navigation_driver.h',
+         ],
+       },
+      ],
+    }],
+  ],
+
 }