diff options
| author | robertm@google.com <robertm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-12 18:12:54 +0000 |
|---|---|---|
| committer | robertm@google.com <robertm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-12 18:12:54 +0000 |
| commit | 788c6b47f2f19c628559a32ee9483babf1d5b9a0 (patch) | |
| tree | d07b689b6881fbf703bab895d6126c2b26893a08 /content | |
| parent | 610420833a3ebe02e484712e3fcdf9eeb6c493c7 (diff) | |
| download | chromium_src-788c6b47f2f19c628559a32ee9483babf1d5b9a0.zip chromium_src-788c6b47f2f19c628559a32ee9483babf1d5b9a0.tar.gz chromium_src-788c6b47f2f19c628559a32ee9483babf1d5b9a0.tar.bz2 | |
Chrome for arm seems to make the implicit assumption that
chromeos is the target in a few places.
Make this assumption explicit.
Also enable nacl in the non-chromeos case so we can start debugging.
Review URL: http://codereview.chromium.org/8776009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114039 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/content_common.gypi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/content_common.gypi b/content/content_common.gypi index e6e833c..7b073dc 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -292,7 +292,7 @@ ], }, }], - ['use_x11 == 1 and target_arch != "arm"', { + ['use_x11 == 1 and (target_arch != "arm" or chromeos == 0)', { 'sources': [ 'common/gpu/x_util.cc', 'common/gpu/x_util.h', @@ -303,7 +303,7 @@ '../gpu/gpu.gyp:command_buffer_service', ], }], - ['target_arch=="arm"', { + ['target_arch=="arm" and chromeos == 1', { 'dependencies': [ '../media/media.gyp:media', ], |