diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-01 16:17:28 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-01 16:17:28 +0000 |
| commit | 1ebcfc953c634e555d9d757a1dfcf562157ba060 (patch) | |
| tree | 893978698a4ef29fce6cacd65679fffb6e278af4 /net | |
| parent | 56f5591d6fd77833c099914faad71528022a43bb (diff) | |
| download | chromium_src-1ebcfc953c634e555d9d757a1dfcf562157ba060.zip chromium_src-1ebcfc953c634e555d9d757a1dfcf562157ba060.tar.gz chromium_src-1ebcfc953c634e555d9d757a1dfcf562157ba060.tar.bz2 | |
Revert 120063 - Remove hand-rolled cases of protobufs generations/compilation
using src/build/protoc.gypi to offer consistency between the other
compilation steps, as well as ensuring that important variables (such as
hard_dependency) are always properly set.
BUG=109955
Review URL: http://codereview.chromium.org/9148084
TBR=kushi.p@gmail.com
Review URL: https://chromiumcodereview.appspot.com/9317034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120066 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/test/test_server.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/test/test_server.cc b/net/test/test_server.cc index 329f994..07575a26 100644 --- a/net/test/test_server.cc +++ b/net/test/test_server.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -318,10 +318,7 @@ bool TestServer::SetPythonPath() { .AppendASCII("browser") .AppendASCII("sync") .AppendASCII("protocol")); - AppendToPythonPath(pyproto_dir.AppendASCII("chrome") - .AppendASCII("browser") - .AppendASCII("policy") - .AppendASCII("proto")); + AppendToPythonPath(pyproto_dir.AppendASCII("device_management_pb")); return true; } |