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

Side by Side Diff: mojo/mojo_public.gypi

Issue 240003006: Get sample_app running on Android again (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanup Created 6 years, 8 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
OLDNEW
1 { 1 {
2 'targets': [ 2 'targets': [
3 { 3 {
4 'target_name': 'mojo_system', 4 'target_name': 'mojo_system',
5 'type': 'static_library', 5 'type': 'static_library',
6 'defines': [ 6 'defines': [
7 'MOJO_SYSTEM_IMPLEMENTATION', 7 'MOJO_SYSTEM_IMPLEMENTATION',
8 ], 8 ],
9 'include_dirs': [ 9 'include_dirs': [
10 '..', 10 '..',
11 ], 11 ],
12 'direct_dependent_settings': { 12 'direct_dependent_settings': {
13 'include_dirs': [ 13 'include_dirs': [
14 '..', 14 '..',
15 ], 15 ],
16 }, 16 },
17 'all_dependent_settings': {
18 'conditions': [
19 # We need to be able to call the MojoSetSystemThunks() function in
20 # system_thunks.cc
21 ['OS=="android"', {
22 'ldflags!': [
23 '-Wl,--exclude-libs=ALL',
24 ],
25 }],
viettrungluu 2014/04/17 00:10:17 "}]," should be indented one level more, and follo
DaveMoore 2014/04/17 14:10:48 Done.
26 ]},
viettrungluu 2014/04/17 00:10:17 And this line should just be a "},".
DaveMoore 2014/04/17 14:10:48 Done.
17 'sources': [ 27 'sources': [
18 'public/c/system/async_waiter.h', 28 'public/c/system/async_waiter.h',
19 'public/c/system/core.h', 29 'public/c/system/core.h',
20 'public/c/system/macros.h', 30 'public/c/system/macros.h',
21 'public/c/system/system_export.h', 31 'public/c/system/system_export.h',
22 'public/platform/native/system_thunks.cc', 32 'public/platform/native/system_thunks.cc',
23 'public/platform/native/system_thunks.h', 33 'public/platform/native/system_thunks.h',
24 ], 34 ],
25 }, 35 },
26 { 36 {
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 ], 358 ],
349 'dependencies': [ 359 'dependencies': [
350 'mojo_shell_bindings', 360 'mojo_shell_bindings',
351 ], 361 ],
352 'export_dependent_settings': [ 362 'export_dependent_settings': [
353 'mojo_shell_bindings', 363 'mojo_shell_bindings',
354 ], 364 ],
355 }, 365 },
356 ], 366 ],
357 } 367 }
OLDNEW
« mojo/mojo_examples.gypi ('K') | « mojo/mojo_examples.gypi ('k') | mojo/mojo_services.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698