| OLD | NEW |
| 1 { | 1 { |
| 2 'targets': [ | 2 'targets': [ |
| 3 { | 3 { |
| 4 'target_name': 'mojo_system', | 4 'target_name': 'mojo_system', |
| 5 'type': '<(component)', | 5 'type': '<(component)', |
| 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/c/system/async_waiter.h', | 18 'public/c/system/async_waiter.h', |
| 19 'public/c/system/core.h', | 19 'public/c/system/core.h', |
| 20 'public/c/system/macros.h', | 20 'public/c/system/macros.h', |
| 21 'public/c/system/system_export.h', | 21 'public/c/system/system_export.h', |
| 22 'public/system/core_private.cc', | 22 'public/system/core_private.cc', |
| 23 'public/system/core_private.h', | 23 'public/system/core_private.h', |
| 24 ], | 24 ], |
| 25 'conditions': [ | 25 'conditions': [ |
| 26 ['OS=="android"', { |
| 27 'ldflags!': [ |
| 28 # Remove default export list because this lib has different exports. |
| 29 '-Wl,--version-script="../../build/android/android_exports.lst"', |
| 30 ], |
| 31 'ldflags': [ |
| 32 # Don't export symbols from statically linked libraries. |
| 33 '-Wl,--exclude-libs=ALL', |
| 34 ], |
| 35 }], |
| 26 ['OS=="mac"', { | 36 ['OS=="mac"', { |
| 27 'xcode_settings': { | 37 'xcode_settings': { |
| 28 # Make it a run-path dependent library. | 38 # Make it a run-path dependent library. |
| 29 'DYLIB_INSTALL_NAME_BASE': '@rpath', | 39 'DYLIB_INSTALL_NAME_BASE': '@rpath', |
| 30 }, | 40 }, |
| 31 'direct_dependent_settings': { | 41 'direct_dependent_settings': { |
| 32 'xcode_settings': { | 42 'xcode_settings': { |
| 33 # Look for run-path dependent libraries in the loader's directory. | 43 # Look for run-path dependent libraries in the loader's directory. |
| 34 'LD_RUNPATH_SEARCH_PATHS': [ '@loader_path/.', ], | 44 'LD_RUNPATH_SEARCH_PATHS': [ '@loader_path/.', ], |
| 35 }, | 45 }, |
| (...skipping 22 matching lines...) Expand all Loading... |
| 58 'GLES2_USE_MOJO', | 68 'GLES2_USE_MOJO', |
| 59 ], | 69 ], |
| 60 }, | 70 }, |
| 61 'sources': [ | 71 'sources': [ |
| 62 'public/c/gles2/gles2.h', | 72 'public/c/gles2/gles2.h', |
| 63 'public/c/gles2/gles2_export.h', | 73 'public/c/gles2/gles2_export.h', |
| 64 'public/gles2/gles2_private.cc', | 74 'public/gles2/gles2_private.cc', |
| 65 'public/gles2/gles2_private.h', | 75 'public/gles2/gles2_private.h', |
| 66 ], | 76 ], |
| 67 'conditions': [ | 77 'conditions': [ |
| 78 ['OS=="android"', { |
| 79 'ldflags!': [ |
| 80 # Remove default export list because this lib has different exports. |
| 81 '-Wl,--version-script="../../build/android/android_exports.lst"', |
| 82 ], |
| 83 'ldflags': [ |
| 84 # Don't export symbols from statically linked libraries. |
| 85 '-Wl,--exclude-libs=ALL', |
| 86 ], |
| 87 }], |
| 68 ['OS=="mac"', { | 88 ['OS=="mac"', { |
| 69 'xcode_settings': { | 89 'xcode_settings': { |
| 70 # Make it a run-path dependent library. | 90 # Make it a run-path dependent library. |
| 71 'DYLIB_INSTALL_NAME_BASE': '@rpath', | 91 'DYLIB_INSTALL_NAME_BASE': '@rpath', |
| 72 }, | 92 }, |
| 73 'direct_dependent_settings': { | 93 'direct_dependent_settings': { |
| 74 'xcode_settings': { | 94 'xcode_settings': { |
| 75 # Look for run-path dependent libraries in the loader's directory. | 95 # Look for run-path dependent libraries in the loader's directory. |
| 76 'LD_RUNPATH_SEARCH_PATHS': [ '@loader_path/.', ], | 96 'LD_RUNPATH_SEARCH_PATHS': [ '@loader_path/.', ], |
| 77 }, | 97 }, |
| (...skipping 15 matching lines...) Expand all Loading... |
| 93 '..', | 113 '..', |
| 94 ], | 114 ], |
| 95 }, | 115 }, |
| 96 'sources': [ | 116 'sources': [ |
| 97 'public/c/test_support/test_support.h', | 117 'public/c/test_support/test_support.h', |
| 98 'public/c/test_support/test_support_export.h', | 118 'public/c/test_support/test_support_export.h', |
| 99 'public/tests/test_support_private.cc', | 119 'public/tests/test_support_private.cc', |
| 100 'public/tests/test_support_private.h', | 120 'public/tests/test_support_private.h', |
| 101 ], | 121 ], |
| 102 'conditions': [ | 122 'conditions': [ |
| 123 ['OS=="android"', { |
| 124 'ldflags!': [ |
| 125 # Remove default export list because this lib has different exports. |
| 126 '-Wl,--version-script="../../build/android/android_exports.lst"', |
| 127 ], |
| 128 'ldflags': [ |
| 129 # Don't export symbols from statically linked libraries. |
| 130 '-Wl,--exclude-libs=ALL', |
| 131 ], |
| 132 }], |
| 103 ['OS=="mac"', { | 133 ['OS=="mac"', { |
| 104 'xcode_settings': { | 134 'xcode_settings': { |
| 105 # Make it a run-path dependent library. | 135 # Make it a run-path dependent library. |
| 106 'DYLIB_INSTALL_NAME_BASE': '@rpath', | 136 'DYLIB_INSTALL_NAME_BASE': '@rpath', |
| 107 }, | 137 }, |
| 108 'direct_dependent_settings': { | 138 'direct_dependent_settings': { |
| 109 'xcode_settings': { | 139 'xcode_settings': { |
| 110 # Look for run-path dependent libraries in the loader's directory. | 140 # Look for run-path dependent libraries in the loader's directory. |
| 111 'LD_RUNPATH_SEARCH_PATHS': [ '@loader_path/.', ], | 141 'LD_RUNPATH_SEARCH_PATHS': [ '@loader_path/.', ], |
| 112 }, | 142 }, |
| (...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 383 ], | 413 ], |
| 384 'dependencies': [ | 414 'dependencies': [ |
| 385 'mojo_shell_bindings', | 415 'mojo_shell_bindings', |
| 386 ], | 416 ], |
| 387 'export_dependent_settings': [ | 417 'export_dependent_settings': [ |
| 388 'mojo_shell_bindings', | 418 'mojo_shell_bindings', |
| 389 ], | 419 ], |
| 390 }, | 420 }, |
| 391 ], | 421 ], |
| 392 } | 422 } |
| OLD | NEW |