chrome/chrome_tests.gypi - Issue 15421002: Roll DEPS for googleurl. Second try.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/chrome_tests.gypi

Issue 15421002: Roll DEPS for googleurl. Second try. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: chrome_frame_ie fix Created 7 years, 7 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

Index: chrome/chrome_tests.gypi

diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi

index 39f14e22ac785e3407e7530faa473facaca8b178..80964f2161465979d87cc693452b80a4045154e7 100644

--- a/chrome/chrome_tests.gypi

+++ b/chrome/chrome_tests.gypi

@@ -518,16 +518,7 @@

'target_name': 'chromedriver_lib',

'type': 'static_library',

'dependencies': [

- 'browser',

- 'chrome',

- 'chrome_resources.gyp:chrome_resources',

- 'chrome_resources.gyp:chrome_strings',

- 'chromedriver_support',

- 'common',

- 'test_support_ui',

- 'test_support_ui_runner',

'../base/base.gyp:base',

- '../build/temp_gyp/googleurl.gyp:googleurl',

'../net/net.gyp:net',

'../skia/skia.gyp:skia',

'../sync/sync.gyp:sync',

@@ -535,6 +526,15 @@

'../third_party/icu/icu.gyp:icui18n',

'../third_party/icu/icu.gyp:icuuc',

'../third_party/libxml/libxml.gyp:libxml',

+ '../url/url.gyp:url_lib',

+ 'browser',

+ 'chrome',

+ 'chrome_resources.gyp:chrome_resources',

+ 'chrome_resources.gyp:chrome_strings',

+ 'chromedriver_support',

+ 'common',

+ 'test_support_ui',

+ 'test_support_ui_runner',

'include_dirs': [

'..',

@@ -769,11 +769,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_lib',

'include_dirs': [

'..',

@@ -1113,14 +1113,14 @@

'target_name': 'chromedriver2_tests',

'type': 'executable',

'dependencies': [

- '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_lib',

+ 'chromedriver2_lib',

'include_dirs': [

'..,'

« no previous file with comments | « chrome/chrome_common.gypi ('k') | chrome_frame/chrome_frame.gyp » ('j') | no next file with comments »