summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-15 23:03:04 +0000
committerapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-15 23:03:04 +0000
commitd663eee8d5e65747a54654648980b7ba72f9d56b (patch)
treea00f62a5c3ce0f5b4afa8c5a03e7846f1010a0a6
parent23acfc08defd8db4cd54d91e86593baf47b461ea (diff)
downloadchromium_src-d663eee8d5e65747a54654648980b7ba72f9d56b.zip
chromium_src-d663eee8d5e65747a54654648980b7ba72f9d56b.tar.gz
chromium_src-d663eee8d5e65747a54654648980b7ba72f9d56b.tar.bz2
Build OSMesa on all platforms and not just on bots.
It was only built on Windows bots before. The new --use-gl switch will now prevent Chrome from using it by default if it finds the shared library, which was the previous behavior. TEST=try BUG=none Review URL: http://codereview.chromium.org/2911011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52568 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--build/all.gyp4
1 files changed, 1 insertions, 3 deletions
diff --git a/build/all.gyp b/build/all.gyp
index f6cb767..f8207b4 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -37,6 +37,7 @@
'../third_party/libxml/libxml.gyp:*',
'../third_party/libxslt/libxslt.gyp:*',
'../third_party/lzma_sdk/lzma_sdk.gyp:*',
+ '../third_party/mesa/mesa.gyp:*',
'../third_party/modp_b64/modp_b64.gyp:*',
'../third_party/npapi/npapi.gyp:*',
'../third_party/ppapi/ppapi.gyp:*',
@@ -263,10 +264,7 @@
'../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
'../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
'../chrome_frame/chrome_frame.gyp:npchrome_frame',
- # Only build OSMesa on buildbots. It builds a software GL renderer
- # that can be used where native GL is not available.
'../third_party/angle/src/build_angle.gyp:*',
- '../third_party/mesa/mesa.gyp:osmesa',
],
},
{