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

Side by Side Diff: runtime/bin/bin.gypi

Issue 504973002: Updating Android library dependencies (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 3 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | runtime/vm/vm.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file 1 # Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
2 # for details. All rights reserved. Use of this source code is governed by a 2 # for details. All rights reserved. Use of this source code is governed by a
3 # BSD-style license that can be found in the LICENSE file. 3 # BSD-style license that can be found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'gen_source_dir': '<(SHARED_INTERMEDIATE_DIR)', 7 'gen_source_dir': '<(SHARED_INTERMEDIATE_DIR)',
8 8
9 'io_cc_file': '<(gen_source_dir)/io_gen.cc', 9 'io_cc_file': '<(gen_source_dir)/io_gen.cc',
10 'io_patch_cc_file': '<(gen_source_dir)/io_patch_gen.cc', 10 'io_patch_cc_file': '<(gen_source_dir)/io_patch_gen.cc',
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 }, 158 },
159 }, 159 },
160 }], 160 }],
161 ['OS=="linux"', { 161 ['OS=="linux"', {
162 'link_settings': { 162 'link_settings': {
163 'libraries': [ 163 'libraries': [
164 '-ldl', 164 '-ldl',
165 ], 165 ],
166 }, 166 },
167 }], 167 }],
168 ['OS=="android"', {
169 'link_settings': {
170 'libraries': [
171 '-ldl',
172 ],
173 },
174 }],
168 ], 175 ],
169 }, 176 },
170 { 177 {
171 'target_name': 'libdart_io', 178 'target_name': 'libdart_io',
172 'type': 'static_library', 179 'type': 'static_library',
173 'toolsets': ['host', 'target'], 180 'toolsets': ['host', 'target'],
174 'include_dirs': [ 181 'include_dirs': [
175 '..', 182 '..',
176 ], 183 ],
177 'includes': [ 184 'includes': [
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 '<(builtin_cc_file)', 285 '<(builtin_cc_file)',
279 '<(io_cc_file)', 286 '<(io_cc_file)',
280 '<(io_patch_cc_file)', 287 '<(io_patch_cc_file)',
281 ], 288 ],
282 'conditions': [ 289 'conditions': [
283 ['OS=="win"', { 290 ['OS=="win"', {
284 'link_settings': { 291 'link_settings': {
285 'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib' ], 292 'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib' ],
286 }, 293 },
287 }], 294 }],
288 # Normally, we should not have flags conditional on OS==android, but
289 # here we must because gen_snapshot is compiled for the host during
290 # and Android cross-build, and these flags are not set anywhere else.
291 ['OS=="android"', {
292 'link_settings': {
293 'libraries': [ '-ldl', '-lrt' ],
294 },
295 }]
296 ], 295 ],
297 }, 296 },
298 { 297 {
299 # Generate snapshot bin file. 298 # Generate snapshot bin file.
300 'target_name': 'generate_snapshot_bin', 299 'target_name': 'generate_snapshot_bin',
301 'type': 'none', 300 'type': 'none',
302 'toolsets':['host'], 301 'toolsets':['host'],
303 'dependencies': [ 302 'dependencies': [
304 'gen_snapshot#host', 303 'gen_snapshot#host',
305 ], 304 ],
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
591 }], 590 }],
592 ['OS=="linux"', { 591 ['OS=="linux"', {
593 'cflags': [ 592 'cflags': [
594 '-fPIC', 593 '-fPIC',
595 ], 594 ],
596 }], 595 }],
597 ], 596 ],
598 }, 597 },
599 ], 598 ],
600 } 599 }
OLDNEW
« no previous file with comments | « no previous file | runtime/vm/vm.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698