diff options
| author | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-03 00:44:57 +0000 |
|---|---|---|
| committer | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-03 00:44:57 +0000 |
| commit | 3df230d41455fe9f6f5d85cd871477d210793b1a (patch) | |
| tree | af5da837f671ddc6250b48f6eedb0e5ccd4295d2 /content | |
| parent | 48ecb532cdc43bc56d5d75f0356ddc2985f3f6fd (diff) | |
| download | chromium_src-3df230d41455fe9f6f5d85cd871477d210793b1a.zip chromium_src-3df230d41455fe9f6f5d85cd871477d210793b1a.tar.gz chromium_src-3df230d41455fe9f6f5d85cd871477d210793b1a.tar.bz2 | |
Fix android webview build after r209777
trace-viewer is not needed in android, and third_party/trace-viewer is
not checked out in downstream android webview build
TBR=dsinclair@chromium.org
BUG=
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/18103008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209834 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/content_browser.gypi | 2 | ||||
| -rw-r--r-- | content/content_shell.gypi | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/content/content_browser.gypi b/content/content_browser.gypi index 8a3c7bd..ec820a6 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -1166,7 +1166,6 @@ }, { # OS!="ios" 'dependencies': [ 'browser/devtools/devtools_resources.gyp:devtools_resources', - 'browser/tracing/tracing_resources.gyp:tracing_resources', '../cc/cc.gyp:cc', '../net/net.gyp:http_server', '../printing/printing.gyp:printing', @@ -1187,6 +1186,7 @@ }], ['OS!="android" and OS!="ios"', { 'dependencies': [ + 'browser/tracing/tracing_resources.gyp:tracing_resources', '../third_party/libyuv/libyuv.gyp:libyuv', ], }], diff --git a/content/content_shell.gypi b/content/content_shell.gypi index 271f74c..4213e7e 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -287,7 +287,6 @@ 'type': 'none', 'dependencies': [ 'browser/devtools/devtools_resources.gyp:devtools_resources', - 'browser/tracing/tracing_resources.gyp:tracing_resources', 'content_resources.gyp:content_resources', 'content_shell_resources', '<(DEPTH)/net/net.gyp:net_resources', @@ -296,6 +295,13 @@ '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources', '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings', ], + 'conditions': [ + ['OS!="android" and OS!="ios"', { + 'dependencies': [ + 'browser/tracing/tracing_resources.gyp:tracing_resources', + ], + }], + ], 'variables': { 'repack_path': '<(DEPTH)/tools/grit/grit/format/repack.py', }, |