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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_tests.gypi

Issue 7054041: Revert 87309 - Second attempt to fix linux redux builder (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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
« no previous file with comments | « chrome/chrome_common.gypi ('k') | crypto/crypto.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests.gypi
===================================================================
--- chrome/chrome_tests.gypi (revision 87314)
+++ chrome/chrome_tests.gypi (working copy)
@@ -215,7 +215,7 @@
['toolkit_uses_gtk == 1', {
'dependencies': [
'../build/linux/system.gyp:gtk',
- '../build/linux/system.gyp:ssl',
+ '../build/linux/system.gyp:nss',
],
}],
['OS=="win"', {
@@ -476,7 +476,7 @@
['toolkit_uses_gtk == 1', {
'dependencies': [
'../build/linux/system.gyp:gtk',
- '../build/linux/system.gyp:ssl',
+ '../build/linux/system.gyp:nss',
'../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
],
}],
@@ -2027,7 +2027,7 @@
],
'dependencies': [
'../build/linux/system.gyp:gtk',
- '../build/linux/system.gyp:ssl',
+ '../build/linux/system.gyp:nss',
'../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
],
'sources!': [
@@ -2571,7 +2571,7 @@
['toolkit_uses_gtk == 1', {
'dependencies': [
'../build/linux/system.gyp:gtk',
- '../build/linux/system.gyp:ssl',
+ '../build/linux/system.gyp:nss',
'../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
],
'sources': [
@@ -3212,7 +3212,7 @@
['toolkit_uses_gtk == 1', {
'dependencies': [
'../build/linux/system.gyp:gtk',
- '../build/linux/system.gyp:ssl',
+ '../build/linux/system.gyp:nss',
'packed_resources'
],
}],
@@ -3336,7 +3336,7 @@
['toolkit_uses_gtk == 1', {
'dependencies': [
'../build/linux/system.gyp:gtk',
- '../build/linux/system.gyp:ssl',
+ '../build/linux/system.gyp:nss',
],
}],
['OS=="mac"', {
@@ -3484,7 +3484,7 @@
['toolkit_uses_gtk == 1', {
'dependencies': [
'../build/linux/system.gyp:gtk',
- '../build/linux/system.gyp:ssl',
+ '../build/linux/system.gyp:nss',
],
}],
['toolkit_views==1', {
« no previous file with comments | « chrome/chrome_common.gypi ('k') | crypto/crypto.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698