From 788c6b47f2f19c628559a32ee9483babf1d5b9a0 Mon Sep 17 00:00:00 2001 From: "robertm@google.com" Date: Mon, 12 Dec 2011 18:12:54 +0000 Subject: 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 --- content/content_common.gypi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'content') 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', ], -- cgit v1.1