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

Unified Diff: runtime/bin/bin.gypi

Issue 11369152: Disable NSS build targets in a Dartium build. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Add comma, comment. 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') | tools/gyp/all.gypi » ('J')
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 4e1cd370dbb4497024093a0e668974df15e74f85..a96345e2c3bc965043e0ef414dd4161b0ffb00c6 100644
--- a/runtime/bin/bin.gypi
+++ b/runtime/bin/bin.gypi
@@ -307,7 +307,7 @@
'target_name': 'libdart_io',
'type': 'static_library',
'dependencies': [
- 'nss_runtime_target',
+ 'nss_runtime',
],
'include_dirs': [
'..',
@@ -337,26 +337,28 @@
],
},
{
- 'target_name': 'nss_runtime_target',
+ 'target_name': 'nss_runtime',
'type': 'none',
- 'dependencies': [
- '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_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',
- ],
+ 'conditions': [[ 'in_dartium==0', {
+ 'dependencies': [
+ '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_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',
+ ],
+ }]],
},
{
'target_name': 'libdart_withcore',
« no previous file with comments | « no previous file | runtime/bin/net/nss.gyp » ('j') | tools/gyp/all.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698