diff options
| author | yongsheng.zhu@intel.com <yongsheng.zhu@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-24 04:32:53 +0000 |
|---|---|---|
| committer | yongsheng.zhu@intel.com <yongsheng.zhu@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-24 04:32:53 +0000 |
| commit | d977ec783b70b66890c88f337219be37bf36eecb (patch) | |
| tree | 37a00d41233b6b839431305244d186bcee9cca0a | |
| parent | bd6007ea79376728e7096a3261e812908933ba85 (diff) | |
| download | chromium_src-d977ec783b70b66890c88f337219be37bf36eecb.zip chromium_src-d977ec783b70b66890c88f337219be37bf36eecb.tar.gz chromium_src-d977ec783b70b66890c88f337219be37bf36eecb.tar.bz2 | |
Fix some errors for building gpu_tests on Android
There are 2 issues:
1) Android doesn't have the switch 'kDisableExperimentalWebGL'
2) Don't depend on the target 'chrome' for gpu_tests on Android
BUG=138226
TEST=compile
Review URL: https://chromiumcodereview.appspot.com/10876033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153159 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/test/gpu/gpu_feature_browsertest.cc | 3 | ||||
| -rw-r--r-- | chrome/test/gpu/test_support_gpu.gypi | 10 |
2 files changed, 13 insertions, 0 deletions
diff --git a/chrome/test/gpu/gpu_feature_browsertest.cc b/chrome/test/gpu/gpu_feature_browsertest.cc index 10726a6..dea9ae4 100644 --- a/chrome/test/gpu/gpu_feature_browsertest.cc +++ b/chrome/test/gpu/gpu_feature_browsertest.cc @@ -231,7 +231,10 @@ class WebGLTest : public GpuFeatureTest { public: virtual void SetUpCommandLine(CommandLine* command_line) { GpuFeatureTest::SetUpCommandLine(command_line); +#if !defined(OS_ANDROID) + // On Android, WebGL is disabled by default command_line->AppendSwitch(switches::kDisableExperimentalWebGL); +#endif } }; diff --git a/chrome/test/gpu/test_support_gpu.gypi b/chrome/test/gpu/test_support_gpu.gypi index 5b7a38f..a1db2a2 100644 --- a/chrome/test/gpu/test_support_gpu.gypi +++ b/chrome/test/gpu/test_support_gpu.gypi @@ -98,5 +98,15 @@ '<(src_dir)/ui/views/views.gyp:views', ], }], + ['OS=="android"', { + 'dependencies!': [ + 'chrome', + ], + 'dependencies': [ + '<@(chromium_dependencies)', + 'chrome_resources.gyp:packed_resources', + 'chrome_resources.gyp:packed_extra_resources', + ], + }], ], } |