diff options
| author | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-04 17:25:00 +0000 |
|---|---|---|
| committer | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-04 17:25:00 +0000 |
| commit | 37a625a6cefff0972bc95d2add8a797a37dbb3f9 (patch) | |
| tree | 43e4b5f31e2d44b6a456fee666b3988d4b2f212d /o3d/DEPS_gyp | |
| parent | e6060447254932d459c6c6fa6061c11a01432c7d (diff) | |
| download | chromium_src-37a625a6cefff0972bc95d2add8a797a37dbb3f9.zip chromium_src-37a625a6cefff0972bc95d2add8a797a37dbb3f9.tar.gz chromium_src-37a625a6cefff0972bc95d2add8a797a37dbb3f9.tar.bz2 | |
This adds in targets for selenium and updated several other problems,
including some problems with the samples and idl generation.
Selenium targets launch selenium on all platforms, but the tests don't
pass anywhere but Windows yet because the plugin isn't found.
I'll work on that next.
Review URL: http://codereview.chromium.org/197014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25467 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/DEPS_gyp')
| -rw-r--r-- | o3d/DEPS_gyp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/o3d/DEPS_gyp b/o3d/DEPS_gyp index c660f01..de4e395 100644 --- a/o3d/DEPS_gyp +++ b/o3d/DEPS_gyp @@ -4,12 +4,13 @@ vars = { "chromium_rev": "22547", "o3d_code_rev": "145", "skia_rev": "279", - "gyp_rev": "601", + "gyp_rev": "626", "gtest_rev": "267", "gflags_rev": "30", "breakpad_rev": "346", "v8_rev": "2624", "icu38_rev": "20192", + "nacl_rev": "569", } deps = { @@ -90,10 +91,8 @@ deps = { "base": Var("chromium_trunk") + "/src/base@" + Var("chromium_rev"), - # NACL has to be in this weird directory because it looks for - # googleclient two levels above it. "native_client": - "http://nativeclient.googlecode.com/svn/trunk/src/native_client@492", + "http://nativeclient.googlecode.com/svn/trunk/src/native_client@" + Var("nacl_rev"), "breakpad/src": "http://google-breakpad.googlecode.com/svn/trunk/src@" + Var("breakpad_rev"), @@ -115,7 +114,6 @@ deps = { "testing/gmock": Var("chromium_trunk") + "/src/testing/gmock@" + Var("chromium_rev"), -# "http://googlemock.googlecode.com/svn/tags/release-1.0.0", # Stuff needed for GYP to run "build": @@ -146,7 +144,7 @@ deps_os = { hooks = [ { # A change to a .gyp, .gypi, or to GYP itself shound run the generator. - "pattern": "\\.gypi?$|[/\\\\]src[/\\\\]tools[/\\\\]gyp[/\\\\]", + "pattern": "\\.gypi?$|[/\\\\]src[/\\\\]tools[/\\\\]gyp[/\\\\]|MANIFEST$", "action": ["python", "tools/gyp/gyp", "o3d/build/all.gyp", "--depth", "."], }, ] |