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

Unified Diff: runtime/bin/bin.gypi

Issue 11365165: Change names of all NSS gyp targets, so they don't conflict with the Chromium target names. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years, 1 month 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 | runtime/bin/net/nss.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/bin.gypi
diff --git a/runtime/bin/bin.gypi b/runtime/bin/bin.gypi
index 7cb4feb3b6cba873c9ac7df13d972136fa626d6d..4e1cd370dbb4497024093a0e668974df15e74f85 100644
--- a/runtime/bin/bin.gypi
+++ b/runtime/bin/bin.gypi
@@ -307,7 +307,7 @@
'target_name': 'libdart_io',
'type': 'static_library',
'dependencies': [
- 'nss',
+ 'nss_runtime_target',
Mads Ager (google) 2012/11/09 11:02:50 How about just nss_runtime?
],
'include_dirs': [
'..',
@@ -337,25 +337,25 @@
],
},
{
- 'target_name': 'nss',
+ 'target_name': 'nss_runtime_target',
'type': 'none',
'dependencies': [
- 'bin/net/nss.gyp:nss',
- 'bin/net/nss.gyp:nspr',
- 'bin/net/nss.gyp:nssckbi',
- 'bin/net/nss.gyp:nss_static',
- 'bin/net/ssl.gyp:libssl',
- 'bin/net/zlib.gyp:zlib',
- 'bin/net/sqlite.gyp:sqlite',
+ 'bin/net/nss.gyp:nss_dart',
+ 'bin/net/nss.gyp:nspr_dart',
+ 'bin/net/nss.gyp:nssckbi_dart',
+ 'bin/net/nss.gyp:nss_static_dart',
+ 'bin/net/ssl.gyp:libssl_dart',
+ 'bin/net/zlib.gyp:zlib_dart',
+ 'bin/net/sqlite.gyp:sqlite_dart',
],
'export_dependent_settings': [
- 'bin/net/nss.gyp:nss',
- 'bin/net/nss.gyp:nspr',
- 'bin/net/nss.gyp:nssckbi',
- 'bin/net/nss.gyp:nss_static',
- 'bin/net/ssl.gyp:libssl',
- 'bin/net/zlib.gyp:zlib',
- 'bin/net/sqlite.gyp:sqlite',
+ 'bin/net/nss.gyp:nss_dart',
+ 'bin/net/nss.gyp:nspr_dart',
+ 'bin/net/nss.gyp:nssckbi_dart',
+ 'bin/net/nss.gyp:nss_static_dart',
+ 'bin/net/ssl.gyp:libssl_dart',
+ 'bin/net/zlib.gyp:zlib_dart',
+ 'bin/net/sqlite.gyp:sqlite_dart',
],
},
{
« no previous file with comments | « no previous file | runtime/bin/net/nss.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698