diff options
| author | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-19 23:21:19 +0000 |
|---|---|---|
| committer | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-19 23:21:19 +0000 |
| commit | 3723b75614a6af7d941c6db60d8a614dfe914664 (patch) | |
| tree | bb63a5f652541098f8b7012a165661f9555589cb /o3d/build/common.gypi | |
| parent | 7e8d231820546f985729d5c44b7a7da13ab02cd4 (diff) | |
| download | chromium_src-3723b75614a6af7d941c6db60d8a614dfe914664.zip chromium_src-3723b75614a6af7d941c6db60d8a614dfe914664.tar.gz chromium_src-3723b75614a6af7d941c6db60d8a614dfe914664.tar.bz2 | |
Removed workaround for Chrome 1.0 from o3djs library.
Fix big causing Canvas sample to crash.
Review URL: http://codereview.chromium.org/303008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29477 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/build/common.gypi')
| -rw-r--r-- | o3d/build/common.gypi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/o3d/build/common.gypi b/o3d/build/common.gypi index 7b1476e..2a22c54 100644 --- a/o3d/build/common.gypi +++ b/o3d/build/common.gypi @@ -6,7 +6,6 @@ 'variables': { 'antlrdir': 'third_party/antlr3', 'breakpaddir': 'breakpad/src', - 'cb_service%': 'none', 'fcolladadir': 'third_party/fcollada/files', 'glewdir': 'third_party/glew/files', 'gtestdir': 'testing/gtest/include', @@ -28,6 +27,7 @@ 'o3d_developer%': '<!(python <(DEPTH)/o3d/build/file_exists.py ' '<(DEPTH)/o3d/o3d_assets/samples/convert_assets/teapot.zip)', 'selenium_screenshots%': 0, + 'cb_service%': 'none', 'conditions' : [ # These have to come first because GYP doesn't like it when # they're part of the same conditional as a conditions clause that |