Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/all.gyp

Issue 14199009: url: Copy 'googleurl_unittests' target from 'url_unittests'. Attempt 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update all.gyp Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | url/url.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/all.gyp
diff --git a/build/all.gyp b/build/all.gyp
index 534636b0e221caa091f860e7abc72a1be41d55bb..2b90af7acf748fea88c7a8c48e5a697fadca50b6 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',
],
},
{
« no previous file with comments | « no previous file | url/url.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698