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

Unified Diff: runtime/bin/bin.gypi

Issue 16254005: Clean up the gyp build of standalone dart executable on Android. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Address comments 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
« no previous file with comments | « no previous file | runtime/bin/filter_dummy.cc » ('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 ca4172d4fca960ab72ba7cc9f7648aec36e04ba6..03c75c64048fb04190ae06c72c2245a0c519252b 100644
--- a/runtime/bin/bin.gypi
+++ b/runtime/bin/bin.gypi
@@ -184,23 +184,18 @@
'include_dirs': [
'..',
],
+ 'includes': [
+ 'io_impl_sources.gypi',
+ ],
'sources': [
'io_natives.h',
'io_natives.cc',
],
'conditions': [
- [ 'dart_io_support==1', {
+ ['dart_io_support==1', {
'dependencies': [
'bin/net/ssl.gyp:libssl_dart',
],
- 'includes': [
- 'io_impl_sources.gypi',
- ],
- },
- {
- 'includes': [
- 'io_impl_sources_no_nss.gypi',
- ],
}],
['OS=="win"', {
# TODO(antonm): fix the implementation.
@@ -343,7 +338,6 @@
{
'target_name': 'generate_resources_cc_file',
'type': 'none',
- 'toolsets':['target', 'host'],
'includes': [
'vmstats_sources.gypi',
],
@@ -372,13 +366,12 @@
# dart binary with a snapshot of corelibs built in.
'target_name': 'dart',
'type': 'executable',
- 'toolsets':['target'],
'dependencies': [
'libdart',
'libdart_builtin',
'libdart_io',
'generate_snapshot_file#host',
- 'generate_resources_cc_file#host',
+ 'generate_resources_cc_file',
],
'include_dirs': [
'..',
@@ -442,12 +435,11 @@
# dart binary without any snapshot built in.
'target_name': 'dart_no_snapshot',
'type': 'executable',
- 'toolsets':['target'],
'dependencies': [
'libdart_withcore',
'libdart_builtin',
'libdart_io',
- 'generate_resources_cc_file#host',
+ 'generate_resources_cc_file',
],
'include_dirs': [
'..',
« no previous file with comments | « no previous file | runtime/bin/filter_dummy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698