diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-20 12:35:40 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-20 12:35:40 +0000 |
commit | 43701242f71429a872b6de8a843d7a04e07b5d7b (patch) | |
tree | a5c6340452ed54c4508dd8e024d84dc8b8bbf3cd /build | |
parent | 913b17c939e0f7dc3bdac9d47ba85de7df528d2a (diff) | |
download | chromium_src-43701242f71429a872b6de8a843d7a04e07b5d7b.zip chromium_src-43701242f71429a872b6de8a843d7a04e07b5d7b.tar.gz chromium_src-43701242f71429a872b6de8a843d7a04e07b5d7b.tar.bz2 |
url: Copy 'googleurl_unittests' target from 'url_unittests'. Attempt 2.
To not break the buildbot, this creates a fake target that copies url_unittests
to googleurl_unittests as temporary scaffolding.
BUG=229660
R=brettw@chromium.org
Review URL: https://chromiumcodereview.appspot.com/14199009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195389 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r-- | build/all.gyp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/build/all.gyp b/build/all.gyp index 534636b..2b90af7 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -203,7 +203,7 @@ '../net/net.gyp:net_unittests', '../sql/sql.gyp:sql_unittests', '../ui/ui.gyp:ui_unittests', - 'temp_gyp/googleurl.gyp:googleurl_unittests', + '../url/url.gyp:googleurl_unittests', ], 'conditions': [ ['OS!="ios"', { @@ -445,7 +445,6 @@ '../content/content.gyp:content_browsertests', '../content/content.gyp:content_unittests', '../device/device.gyp:device_unittests', - '../ui/ui.gyp:ui_unittests', '../gpu/gpu.gyp:gpu_unittests', '../ipc/ipc.gyp:ipc_tests', '../jingle/jingle.gyp:jingle_unittests', @@ -458,8 +457,9 @@ '../sync/sync.gyp:sync_unit_tests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', + '../ui/ui.gyp:ui_unittests', + '../url/url.gyp:googleurl_unittests', '../webkit/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests', - 'temp_gyp/googleurl.gyp:googleurl_unittests', ], }, { @@ -477,7 +477,6 @@ '../content/content.gyp:content_browsertests', '../content/content.gyp:content_unittests', '../device/device.gyp:device_unittests', - '../ui/ui.gyp:ui_unittests', '../gpu/gpu.gyp:gpu_unittests', '../ipc/ipc.gyp:ipc_tests', '../jingle/jingle.gyp:jingle_unittests', @@ -489,8 +488,9 @@ '../sync/sync.gyp:sync_unit_tests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', + '../ui/ui.gyp:ui_unittests', + '../url/url.gyp:googleurl_unittests', '../webkit/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests', - 'temp_gyp/googleurl.gyp:googleurl_unittests', ], }, { @@ -500,15 +500,15 @@ '../base/base.gyp:base_unittests', '../cloud_print/cloud_print.gyp:cloud_print_unittests', '../crypto/crypto.gyp:crypto_unittests', - 'temp_gyp/googleurl.gyp:googleurl_unittests', - '../net/net.gyp:net_unittests', '../ipc/ipc.gyp:ipc_tests', '../jingle/jingle.gyp:jingle_unittests', '../media/media.gyp:media_unittests', + '../net/net.gyp:net_unittests', '../printing/printing.gyp:printing_unittests', '../remoting/remoting.gyp:remoting_unittests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', + '../url/url.gyp:googleurl_unittests', ], }, { @@ -525,24 +525,24 @@ 'type': 'none', 'dependencies': [ '../base/base.gyp:base_unittests', + '../chrome/chrome.gyp:unit_tests', '../cloud_print/cloud_print.gyp:cloud_print_unittests', + '../components/components.gyp:components_unittests', + '../content/content.gyp:content_unittests', '../crypto/crypto.gyp:crypto_unittests', + '../device/device.gyp:device_unittests', '../ipc/ipc.gyp:ipc_tests', + '../jingle/jingle.gyp:jingle_unittests', '../media/media.gyp:media_unittests', '../net/net.gyp:net_unittests', '../printing/printing.gyp:printing_unittests', '../remoting/remoting.gyp:remoting_unittests', - '../chrome/chrome.gyp:unit_tests', - '../components/components.gyp:components_unittests', - '../content/content.gyp:content_unittests', - '../device/device.gyp:device_unittests', - '../ui/ui.gyp:ui_unittests', - '../jingle/jingle.gyp:jingle_unittests', '../sql/sql.gyp:sql_unittests', '../sync/sync.gyp:sync_unit_tests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', - 'temp_gyp/googleurl.gyp:googleurl_unittests', + '../ui/ui.gyp:ui_unittests', + '../url/url.gyp:googleurl_unittests', ], }, ], # targets @@ -574,7 +574,6 @@ '../chrome_frame/chrome_frame.gyp:npchrome_frame', '../courgette/courgette.gyp:courgette_unittests', '../device/device.gyp:device_unittests', - '../ui/ui.gyp:ui_unittests', '../gpu/gpu.gyp:gpu_unittests', '../ipc/ipc.gyp:ipc_tests', '../jingle/jingle.gyp:jingle_unittests', @@ -586,10 +585,11 @@ '../sync/sync.gyp:sync_unit_tests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', + '../ui/ui.gyp:ui_unittests', '../ui/views/views.gyp:views_unittests', + '../url/url.gyp:googleurl_unittests', '../webkit/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests', '../webkit/webkit.gyp:pull_in_copy_TestNetscapePlugIn', - 'temp_gyp/googleurl.gyp:googleurl_unittests', ], 'conditions': [ ['target_arch!="x64"', { @@ -644,7 +644,7 @@ '../sql/sql.gyp:sql_unittests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', - 'temp_gyp/googleurl.gyp:googleurl_unittests', + '../url/url.gyp:googleurl_unittests', ], }, { @@ -667,7 +667,7 @@ '../sql/sql.gyp:sql_unittests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', - 'temp_gyp/googleurl.gyp:googleurl_unittests', + '../url/url.gyp:googleurl_unittests', ], }, { |