diff options
| author | justincohen@google.com <justincohen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-27 14:05:59 +0000 |
|---|---|---|
| committer | justincohen@google.com <justincohen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-27 14:05:59 +0000 |
| commit | 77a5d4db84cab6e82ff1e89134874bc67adc7c5f (patch) | |
| tree | 502efa5b97c82b307710cd241fb418f996d5cd34 | |
| parent | 3b1cb771826ddbbe0342f586837166111ad7a033 (diff) | |
| download | chromium_src-77a5d4db84cab6e82ff1e89134874bc67adc7c5f.zip chromium_src-77a5d4db84cab6e82ff1e89134874bc67adc7c5f.tar.gz chromium_src-77a5d4db84cab6e82ff1e89134874bc67adc7c5f.tar.bz2 | |
Skip content_child for iOS.
content_child excludes all files for iOS, so don't try to include it.
BUG=None
TEST=ninja iOS all builds work.
Review URL: https://chromiumcodereview.appspot.com/23264009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219785 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/content.gyp | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/content/content.gyp b/content/content.gyp index c68fd3a..9c51df7 100644 --- a/content/content.gyp +++ b/content/content.gyp @@ -47,12 +47,12 @@ 'type': 'none', 'dependencies': [ 'content_browser', - 'content_child', 'content_common', ], 'conditions': [ ['OS != "ios"', { 'dependencies': [ + 'content_child', 'content_gpu', 'content_plugin', 'content_ppapi_plugin', @@ -152,29 +152,24 @@ # Disable c4267 warnings until we fix size_t to int truncations. 'msvs_disabled_warnings': [ 4267, ], }, - { - 'target_name': 'content_child', - 'type': 'static_library', - 'variables': { 'enable_wexit_time_destructors': 1, }, - 'includes': [ - 'content_child.gypi', - ], - 'conditions': [ - ['OS != "ios"', { - 'dependencies': [ - 'content_resources.gyp:content_resources', - ], - }], - ], - # Disable c4267 warnings until we fix size_t to int truncations. - 'msvs_disabled_warnings': [ 4267, ], - }, - ], 'conditions': [ ['OS != "ios"', { 'targets': [ { + 'target_name': 'content_child', + 'type': 'static_library', + 'variables': { 'enable_wexit_time_destructors': 1, }, + 'includes': [ + 'content_child.gypi', + ], + 'dependencies': [ + 'content_resources.gyp:content_resources', + ], + # Disable c4267 warnings until we fix size_t to int truncations. + 'msvs_disabled_warnings': [ 4267, ], + }, + { 'target_name': 'content_gpu', 'type': 'static_library', 'variables': { 'enable_wexit_time_destructors': 1, }, |