diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-12 18:29:52 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-12 18:29:52 +0000 |
| commit | e6b2093a888e1e55626475dfe9cc813596b206bc (patch) | |
| tree | e4ef749d9c58e52f902b5c2d90944c5827d6e8ed /chrome/chrome_tests.gypi | |
| parent | f55849fdae7bd1fdc7cc52767f99d91251496ad0 (diff) | |
| download | chromium_src-e6b2093a888e1e55626475dfe9cc813596b206bc.zip chromium_src-e6b2093a888e1e55626475dfe9cc813596b206bc.tar.gz chromium_src-e6b2093a888e1e55626475dfe9cc813596b206bc.tar.bz2 | |
Roll the DEPS for google-url.
And update all the references from build/temp_gyp/googleurl.gyp to url/url.gyp.
This also changes googleurl.gyp to reference the files under url/, so that we
don't break the Blink tree.
BUG=229660
R=brettw@chromium.org
TBR=brettw@chromium.org
Review URL: https://chromiumcodereview.appspot.com/14089011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193968 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
| -rw-r--r-- | chrome/chrome_tests.gypi | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index e320edf..baed24b 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -499,7 +499,6 @@ 'common', 'test_support_ui', '../base/base.gyp:base', - '../build/temp_gyp/googleurl.gyp:googleurl', '../net/net.gyp:net', '../skia/skia.gyp:skia', '../sync/sync.gyp:sync', @@ -507,6 +506,7 @@ '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', '../third_party/libxml/libxml.gyp:libxml', + '../url/url.gyp:url', ], 'include_dirs': [ '..', @@ -741,11 +741,11 @@ 'dependencies': [ '../base/base.gyp:base', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', - '../build/temp_gyp/googleurl.gyp:googleurl', '../net/net.gyp:net', '../third_party/zlib/zlib.gyp:minizip', '../third_party/zlib/zlib.gyp:zlib', '../ui/ui.gyp:ui', + '../url/url.gyp:url', ], 'include_dirs': [ '..', @@ -1057,11 +1057,11 @@ 'chromedriver2_lib', '../base/base.gyp:base', '../base/base.gyp:run_all_unittests', - '../build/temp_gyp/googleurl.gyp:googleurl', '../net/net.gyp:http_server', '../net/net.gyp:net', '../net/net.gyp:net_test_support', '../testing/gtest.gyp:gtest', + '../url/url.gyp:url', ], 'include_dirs': [ '..,' @@ -3100,20 +3100,20 @@ 'interactive_ui_tests', # Disabled from running in coverage_posix.py. # We need to build this during compile step, so enabling here. - 'browser_tests', + '../content/content.gyp:content_browsertests', '../courgette/courgette.gyp:courgette_unittests', '../crypto/crypto.gyp:crypto_unittests', - 'chromedriver_unittests', - '../build/temp_gyp/googleurl.gyp:googleurl_unittests', - 'gpu_tests', '../jingle/jingle.gyp:jingle_unittests', '../net/net.gyp:net_perftests', + '../third_party/WebKit/Source/WebKit/chromium/WebKitUnitTests.gyp:webkit_unit_tests', + '../url/url.gyp:googleurl_unittests', + 'browser_tests', + 'chromedriver_unittests', + 'gpu_tests', 'performance_ui_tests', + 'pyautolib', 'reliability_tests', 'sync_integration_tests', - '../third_party/WebKit/Source/WebKit/chromium/WebKitUnitTests.gyp:webkit_unit_tests', - 'pyautolib', - '../content/content.gyp:content_browsertests', ]}], ['OS=="mac"', { 'dependencies': [ |