chrome/chrome_tests.gypi - Issue 298863012: Use upstream libaddressinput in Chrome.

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 298863012: Use upstream libaddressinput in Chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merged in https://codereview.chromium.org/300303002/ Created 6 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:

Index: chrome/chrome_tests.gypi

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

index f09879c47069f57f76a83acf61f2fe29b41ca36e..a1521c18af144c55bc3454fb089e5208a3ffaf7c 100644

--- a/chrome/chrome_tests.gypi

+++ b/chrome/chrome_tests.gypi

@@ -825,7 +825,7 @@

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

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

'../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',

- '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput',

+ '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_chromium',

'../third_party/libjingle/libjingle.gyp:peerconnection_server',

'../third_party/safe_browsing/safe_browsing.gyp:safe_browsing',

'../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',

@@ -2023,8 +2023,8 @@

]

}],

['enable_autofill_dialog!=1 or OS=="android" or OS=="ios"', {

- 'dependencies!': [

- '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput',

+ '!dependencies': [

+ '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_chromium',

}],

['use_ozone==1', {