Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'variables': { | |
| 7 # Core sources shared by sessions_content and sessions_ios. | |
| 8 # | |
| 9 # TODO(rohitrao): We are including these sources directly into each | |
|
blundell
2014/10/24 14:10:42
I think this still doesn't explain the key issue,
| |
| 10 # individual target in order to avoid the complications associated with | |
| 11 # making a separate sessions_core target. Because sessions_content is a | |
| 12 # shared_library, depending directly on static libraries can cause issues. | |
| 13 # Since sessions is still a small target, it is simplest to just share these | |
| 14 # sources across targets. Revisit if sessions grows large enough that it | |
| 15 # makes sense to split out a separate sessions_core target. | |
| 16 'sessions_core_sources': [ | |
| 17 'sessions/core/serialized_navigation_driver.h', | |
| 18 'sessions/serialized_navigation_entry.cc', | |
| 19 'sessions/serialized_navigation_entry.h', | |
| 20 'sessions/session_id.cc', | |
| 21 'sessions/session_id.h', | |
| 22 ], | |
| 23 }, | |
| 6 'targets': [ | 24 'targets': [ |
| 7 { | 25 { |
| 8 # GN version: //components/sessions | 26 # GN version: //components/sessions:sessions_content |
| 9 'target_name': 'sessions', | 27 'target_name': 'sessions_content', |
| 10 'type': '<(component)', | 28 'type': '<(component)', |
| 11 'dependencies': [ | 29 'dependencies': [ |
| 12 '../base/base.gyp:base', | 30 '../base/base.gyp:base', |
| 13 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', | 31 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', |
| 14 '../content/content.gyp:content_browser', | 32 '../content/content.gyp:content_browser', |
| 15 '../skia/skia.gyp:skia', | 33 '../skia/skia.gyp:skia', |
| 16 '../third_party/protobuf/protobuf.gyp:protobuf_lite', | 34 '../third_party/protobuf/protobuf.gyp:protobuf_lite', |
| 17 '../ui/base/ui_base.gyp:ui_base', | 35 '../ui/base/ui_base.gyp:ui_base', |
| 18 '../url/url.gyp:url_lib', | 36 '../url/url.gyp:url_lib', |
| 19 ], | 37 ], |
| 20 'include_dirs': [ | 38 'include_dirs': [ |
| 21 '..', | 39 '..', |
| 22 ], | 40 ], |
| 23 'defines': [ | 41 'defines': [ |
| 24 'SESSIONS_IMPLEMENTATION', | 42 'SESSIONS_IMPLEMENTATION', |
| 25 ], | 43 ], |
| 26 'sources': [ | 44 'sources': [ |
| 27 # Note: sources list duplicated in GN build. | 45 # Note: sources list duplicated in GN build. |
| 46 '<@(sessions_core_sources)', | |
| 28 | 47 |
| 29 # TODO(rohitrao): Split this target into three separate core, content, | |
| 30 # and web targets. | |
| 31 'sessions/content/content_serialized_navigation_builder.cc', | 48 'sessions/content/content_serialized_navigation_builder.cc', |
| 32 'sessions/content/content_serialized_navigation_builder.h', | 49 'sessions/content/content_serialized_navigation_builder.h', |
| 33 'sessions/content/content_serialized_navigation_driver.cc', | 50 'sessions/content/content_serialized_navigation_driver.cc', |
| 34 'sessions/content/content_serialized_navigation_driver.h', | 51 'sessions/content/content_serialized_navigation_driver.h', |
| 35 'sessions/core/serialized_navigation_driver.h', | |
| 36 'sessions/serialized_navigation_entry.cc', | |
| 37 'sessions/serialized_navigation_entry.h', | |
| 38 'sessions/session_id.cc', | |
| 39 'sessions/session_id.h', | |
| 40 ], | 52 ], |
| 41 'conditions': [ | 53 'conditions': [ |
| 42 ['android_webview_build == 0', { | 54 ['android_webview_build == 0', { |
| 43 'dependencies': [ | 55 'dependencies': [ |
| 44 '../sync/sync.gyp:sync', | 56 '../sync/sync.gyp:sync', |
| 45 ] | 57 ] |
| 46 }], | 58 }], |
| 47 ], | 59 ], |
| 48 }, | 60 }, |
| 49 { | 61 { |
| (...skipping 16 matching lines...) Expand all Loading... | |
| 66 'conditions': [ | 78 'conditions': [ |
| 67 ['android_webview_build == 0', { | 79 ['android_webview_build == 0', { |
| 68 'dependencies': [ | 80 'dependencies': [ |
| 69 '../sync/sync.gyp:sync', | 81 '../sync/sync.gyp:sync', |
| 70 ] | 82 ] |
| 71 }], | 83 }], |
| 72 ], | 84 ], |
| 73 }, | 85 }, |
| 74 ], | 86 ], |
| 75 } | 87 } |
| OLD | NEW |