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

Side by Side Diff: mojo/mojo_public.gypi

Issue 211503005: Fixup mojo dylibs to support mojo in content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Only add mac to supported mojo platforms 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
« no previous file with comments | « content/content_shell.gypi ('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': 'shared_library', 5 'type': 'shared_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 'sources': [ 17 'sources': [
18 'public/system/async_waiter.h', 18 'public/system/async_waiter.h',
19 'public/system/core.h', 19 'public/system/core.h',
20 'public/system/core_cpp.h', 20 'public/system/core_cpp.h',
21 'public/system/core_private.cc', 21 'public/system/core_private.cc',
22 'public/system/core_private.h', 22 'public/system/core_private.h',
23 'public/system/macros.h', 23 'public/system/macros.h',
24 'public/system/system_export.h', 24 'public/system/system_export.h',
25 ], 25 ],
26 'conditions': [ 26 'conditions': [
27 ['OS=="mac"', { 27 ['OS=="mac"', {
28 'xcode_settings': { 28 'xcode_settings': {
29 # Make it a run-path dependent library. 29 # Make it a loader-path dependent library.
30 'DYLIB_INSTALL_NAME_BASE': '@rpath', 30 'DYLIB_INSTALL_NAME_BASE': '@loader_path',
31 },
32 'direct_dependent_settings': {
33 'xcode_settings': {
34 # Look for run-path dependent libraries in the loader's directory.
35 'LD_RUNPATH_SEARCH_PATHS': [ '@loader_path/.', ],
36 },
37 }, 31 },
Mark Mentovai 2014/03/25 21:03:10 We need to arrange for libmojo_system’s symbols to
DaveMoore 2014/03/25 21:46:30 Done.
38 }], 32 }],
39 ], 33 ],
40 }, 34 },
41 { 35 {
42 'target_name': 'mojo_gles2', 36 'target_name': 'mojo_gles2',
43 'type': 'shared_library', 37 'type': 'shared_library',
44 'defines': [ 38 'defines': [
45 'MOJO_GLES2_IMPLEMENTATION', 39 'MOJO_GLES2_IMPLEMENTATION',
46 'GLES2_USE_MOJO', 40 'GLES2_USE_MOJO',
47 ], 41 ],
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 ], 365 ],
372 'dependencies': [ 366 'dependencies': [
373 'mojo_shell_bindings', 367 'mojo_shell_bindings',
374 ], 368 ],
375 'export_dependent_settings': [ 369 'export_dependent_settings': [
376 'mojo_shell_bindings', 370 'mojo_shell_bindings',
377 ], 371 ],
378 }, 372 },
379 ], 373 ],
380 } 374 }
OLDNEW
« no previous file with comments | « content/content_shell.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698