diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-05 15:42:33 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-05 15:42:33 +0000 |
| commit | 26011a704e17f9121cc6ddacbf043c7b73f25ad2 (patch) | |
| tree | e46a4b9e166045ed287ce78187d9a37b92336236 /components/plugins.gypi | |
| parent | 084aa5bab493b6ef79d77ca7dde41b1cc2b5db59 (diff) | |
| download | chromium_src-26011a704e17f9121cc6ddacbf043c7b73f25ad2.zip chromium_src-26011a704e17f9121cc6ddacbf043c7b73f25ad2.tar.gz chromium_src-26011a704e17f9121cc6ddacbf043c7b73f25ad2.tar.bz2 | |
components: Eliminate ios checks from individual gyp include files.
We don't need to wrap the targets of these files inside ios condition
because we already do this in components.gyp.
BUG=325241
TEST=gyp + build + green trybots
R=blundell@chromium.org
NOTRY=true
Review URL: https://codereview.chromium.org/266103002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@268188 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/plugins.gypi')
| -rw-r--r-- | components/plugins.gypi | 61 |
1 files changed, 28 insertions, 33 deletions
diff --git a/components/plugins.gypi b/components/plugins.gypi index e56ed09..9775d8b 100644 --- a/components/plugins.gypi +++ b/components/plugins.gypi @@ -3,39 +3,34 @@ # found in the LICENSE file. { - 'conditions': [ - ['OS != "ios"', { - - 'targets': [ - { - 'target_name': 'plugins_renderer', - 'type': 'static_library', - 'dependencies': [ - '../third_party/re2/re2.gyp:re2', - '../gin/gin.gyp:gin', - '../skia/skia.gyp:skia', - '../third_party/WebKit/public/blink.gyp:blink', - '../v8/tools/gyp/v8.gyp:v8', - ], - 'include_dirs': [ - '..', - ], + 'targets': [ + { + 'target_name': 'plugins_renderer', + 'type': 'static_library', + 'dependencies': [ + '../gin/gin.gyp:gin', + '../skia/skia.gyp:skia', + '../third_party/WebKit/public/blink.gyp:blink', + '../third_party/re2/re2.gyp:re2', + '../v8/tools/gyp/v8.gyp:v8', + ], + 'include_dirs': [ + '..', + ], + 'sources': [ + 'plugins/renderer/plugin_placeholder.cc', + 'plugins/renderer/plugin_placeholder.h', + 'plugins/renderer/webview_plugin.cc', + 'plugins/renderer/webview_plugin.h', + ], + 'conditions' : [ + ['OS=="android"', { 'sources': [ - 'plugins/renderer/plugin_placeholder.cc', - 'plugins/renderer/plugin_placeholder.h', - 'plugins/renderer/webview_plugin.cc', - 'plugins/renderer/webview_plugin.h', - ], - 'conditions' : [ - ['OS=="android"', { - 'sources': [ - 'plugins/renderer/mobile_youtube_plugin.cc', - 'plugins/renderer/mobile_youtube_plugin.h', - ] - }], - ], - }, - ] - }] + 'plugins/renderer/mobile_youtube_plugin.cc', + 'plugins/renderer/mobile_youtube_plugin.h', + ] + }], + ], + }, ] } |