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

Side by Side Diff: mojo/mojo_public.gypi

Issue 264563005: Enable Mojo on iOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « mojo/mojo.gyp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 '..',
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 ['OS=="mac"', { 64 ['OS=="mac"', {
65 'xcode_settings': { 65 'xcode_settings': {
66 # Make it a run-path dependent library. 66 # Make it a run-path dependent library.
67 'DYLIB_INSTALL_NAME_BASE': '@loader_path', 67 'DYLIB_INSTALL_NAME_BASE': '@loader_path',
68 }, 68 },
69 }], 69 }],
70 ], 70 ],
71 }, 71 },
72 { 72 {
73 'target_name': 'mojo_test_support', 73 'target_name': 'mojo_test_support',
74 'type': 'shared_library', 74 # Changed this from a shared library to a static library as it wasn't
75 # found on iOS when it was a shared library.
76 'type': 'static_library',
75 'defines': [ 77 'defines': [
76 'MOJO_TEST_SUPPORT_IMPLEMENTATION', 78 'MOJO_TEST_SUPPORT_IMPLEMENTATION',
77 ], 79 ],
78 'include_dirs': [ 80 'include_dirs': [
79 '..', 81 '..',
80 ], 82 ],
81 'direct_dependent_settings': { 83 'direct_dependent_settings': {
82 'include_dirs': [ 84 'include_dirs': [
83 '..', 85 '..',
84 ], 86 ],
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 'type': 'none', 379 'type': 'none',
378 'variables': { 380 'variables': {
379 'java_in_dir': 'public/java', 381 'java_in_dir': 'public/java',
380 }, 382 },
381 'includes': [ '../build/java.gypi' ], 383 'includes': [ '../build/java.gypi' ],
382 }, 384 },
383 ], 385 ],
384 }], 386 }],
385 ], 387 ],
386 } 388 }
OLDNEW
« no previous file with comments | « mojo/mojo.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698