diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-26 06:54:06 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-26 06:54:06 +0000 |
| commit | 638235b0ef2c3e12f6ceecf05f89caf46b311d81 (patch) | |
| tree | b676ad477a68bad89cd6a35dff9d4e791cef5692 /chrome/chrome.gyp | |
| parent | 48c27f7fac6bb5cf9cc995df8a68d4f6d4c10600 (diff) | |
| download | chromium_src-638235b0ef2c3e12f6ceecf05f89caf46b311d81.zip chromium_src-638235b0ef2c3e12f6ceecf05f89caf46b311d81.tar.gz chromium_src-638235b0ef2c3e12f6ceecf05f89caf46b311d81.tar.bz2 | |
Fix the ARM build which can't find OpenGL. This adds a new define which I use
to detect X and GL related build options. On ARM, this means we don't compile
the accelerated backing store even though its Linux.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/546144
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37091 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
| -rwxr-xr-x | chrome/chrome.gyp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 01a1f52..1dc7541 100755 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -590,6 +590,7 @@ 'sources': [ 'gpu/gpu_backing_store_win.cc', 'gpu/gpu_backing_store_win.h', + 'gpu/gpu_config.h', 'gpu/gpu_main.cc', 'gpu/gpu_process.cc', 'gpu/gpu_process.h', @@ -607,7 +608,7 @@ 'third_party/wtl/include', ], }], - ['OS=="linux"', { + ['OS=="linux" and target_arch!="arm"', { 'sources': [ 'gpu/gpu_backing_store_glx.cc', 'gpu/gpu_backing_store_glx.h', |