diff options
| author | lzheng@chromium.org <lzheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-28 17:51:57 +0000 |
|---|---|---|
| committer | lzheng@chromium.org <lzheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-28 17:51:57 +0000 |
| commit | 1ebf8968d8b95f16a7da03c567d55782fe08ff39 (patch) | |
| tree | ce26904aefc88e6354c6e803444e280e0cb3aa55 | |
| parent | c85f885e78c75950c66d833b2f79e462623c98c6 (diff) | |
| download | chromium_src-1ebf8968d8b95f16a7da03c567d55782fe08ff39.zip chromium_src-1ebf8968d8b95f16a7da03c567d55782fe08ff39.tar.gz chromium_src-1ebf8968d8b95f16a7da03c567d55782fe08ff39.tar.bz2 | |
Add safebrowsing test server into dependencies. Also added Readme.chromium for third party code inclusion and safe_browsing.gyp to specified the dependency between this test and proto buffer.
TEST=none
BUG=47318
Review URL: http://codereview.chromium.org/3475013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60810 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 3 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 2 | ||||
| -rw-r--r-- | third_party/safe_browsing/README.chromium | 8 | ||||
| -rw-r--r-- | third_party/safe_browsing/safe_browsing.gyp | 29 |
4 files changed, 42 insertions, 0 deletions
@@ -51,6 +51,9 @@ deps = { "src/third_party/protobuf2/src": (Var("googlecode_url") % "protobuf") + "/trunk@346", + "src/third_party/safe_browsing/testing": + "http://google-safe-browsing.googlecode.com/svn/trunk/testing@99", + "src/third_party/cacheinvalidation/files": (Var("googlecode_url") % "google-cache-invalidation-api") + "/trunk@35", diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index c063b32..3651641 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1966,6 +1966,8 @@ '../net/net.gyp:net_test_support', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', + # This is the safebrowsing test server. + '../third_party/safe_browsing/safe_browsing.gyp:safe_browsing', ], 'include_dirs': [ '..', diff --git a/third_party/safe_browsing/README.chromium b/third_party/safe_browsing/README.chromium new file mode 100644 index 0000000..81d472e --- /dev/null +++ b/third_party/safe_browsing/README.chromium @@ -0,0 +1,8 @@ +Name: Google Cache Invalidation API +URL: http://code.google.com/p/google-safe-browsing/
+License: Apache 2.0 +License File: testing/LICENSE + +Description: +This is the safebrowsing testing server that could be used to
+verify the safebrowsing logic in chrome (and other browsers).
diff --git a/third_party/safe_browsing/safe_browsing.gyp b/third_party/safe_browsing/safe_browsing.gyp new file mode 100644 index 0000000..819d5f3 --- /dev/null +++ b/third_party/safe_browsing/safe_browsing.gyp @@ -0,0 +1,29 @@ +# Copyright (c) 2010 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. + +{ + 'targets': [ + { + 'target_name': 'safe_browsing', + 'type': 'none', + 'sources': [ + 'testing/external_test_pb2.py', + 'testing/safebrowsing_test_server.py', + 'testing/testing_input.dat', + ], + 'export_dependent_settings': [ + '../protobuf2/protobuf.gyp:py_proto', + ], + 'dependencies': [ + '../protobuf2/protobuf.gyp:py_proto', + ], + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: |