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

Unified Diff: trunk/src/chrome/chrome_tests.gypi

Issue 14109014: Lets try this again. (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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 | « trunk/src/chrome/chrome_common.gypi ('k') | trunk/src/chrome_frame/chrome_frame.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/chrome_tests.gypi
===================================================================
--- trunk/src/chrome/chrome_tests.gypi (revision 193988)
+++ trunk/src/chrome/chrome_tests.gypi (working copy)
@@ -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',
+ '../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',
- '../build/temp_gyp/googleurl.gyp:googleurl_unittests',
'gpu_tests',
- '../jingle/jingle.gyp:jingle_unittests',
- '../net/net.gyp:net_perftests',
'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': [
« no previous file with comments | « trunk/src/chrome/chrome_common.gypi ('k') | trunk/src/chrome_frame/chrome_frame.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698