diff options
author | iannucci@chromium.org <iannucci@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-31 01:07:32 +0000 |
---|---|---|
committer | iannucci@chromium.org <iannucci@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-31 01:07:32 +0000 |
commit | 69e1c46004ad506b2a7cfbce218f4cd20ba76bfe (patch) | |
tree | a888a9aa5dde202f123e8faba2defc569fceb1c7 /sync/notifier/invalidation_util.cc | |
parent | 9c5620d351e6f8f384de2b3c8a3d2ec34101e21e (diff) | |
download | chromium_src-69e1c46004ad506b2a7cfbce218f4cd20ba76bfe.zip chromium_src-69e1c46004ad506b2a7cfbce218f4cd20ba76bfe.tar.gz chromium_src-69e1c46004ad506b2a7cfbce218f4cd20ba76bfe.tar.bz2 |
Change protoc build rule to not use cygwin bash.
Now protoc.exe will be directly invoked.
This rolls cacheinvalidation from r218:r219
------------------------------------------------------------------------
r219 | ghcooper@gmail.com | 2012-07-20 17:44:14 -0700 (Fri, 20 Jul 2012) | 1 line
move protos out of v2/; use relative paths for proto imports
------------------------------------------------------------------------
This also rolls gyp from r1440:r1441
------------------------------------------------------------------------
r1441 | iannucci@chromium.org | 2012-07-26 17:54:17 -0700 (Thu, 26 Jul 2012) | 8 lines
Fix bug: non-cygwin actions incorrectly run options through _FixPath.
This adds an additional heuristic to the existing one. Now if an option begins
with either a '/' OR a '-', it assumes it's not a strict path.
Added a TODO which notes that the existing (and new) behavior will miss options
such as '--opt=a/posix/path', and '/opt:a/posix/path'.
Review URL: https://chromiumcodereview.appspot.com/10829049
------------------------------------------------------------------------
BUG=123026,113339
R=scottmg@chromium.org,cmp@chromium.org,nsylvain@chromium.org,jar@chromium.org,akalin@chromium.org,maruel@chromium.org
TEST=
Review URL: https://chromiumcodereview.appspot.com/10796051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149100 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/notifier/invalidation_util.cc')
-rw-r--r-- | sync/notifier/invalidation_util.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sync/notifier/invalidation_util.cc b/sync/notifier/invalidation_util.cc index 5b18d66..b10e2b4 100644 --- a/sync/notifier/invalidation_util.cc +++ b/sync/notifier/invalidation_util.cc @@ -7,7 +7,7 @@ #include <sstream> #include "google/cacheinvalidation/include/types.h" -#include "google/cacheinvalidation/v2/types.pb.h" +#include "google/cacheinvalidation/types.pb.h" namespace syncer { |