| OLD | NEW |
| 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 'GLES2_USE_MOJO', | 59 'GLES2_USE_MOJO', |
| 60 ], | 60 ], |
| 61 }, | 61 }, |
| 62 'sources': [ | 62 'sources': [ |
| 63 'public/c/gles2/gles2.h', | 63 'public/c/gles2/gles2.h', |
| 64 'public/c/gles2/gles2_export.h', | 64 'public/c/gles2/gles2_export.h', |
| 65 'public/gles2/gles2_private.cc', | 65 'public/gles2/gles2_private.cc', |
| 66 'public/gles2/gles2_private.h', | 66 'public/gles2/gles2_private.h', |
| 67 ], | 67 ], |
| 68 'conditions': [ | 68 'conditions': [ |
| 69 ['OS=="android"', { |
| 70 'ldflags!': [ |
| 71 # Remove default export list because this lib has different exports. |
| 72 '-Wl,--version-script=<(android_linker_script)', |
| 73 ], |
| 74 'ldflags': [ |
| 75 # Don't export symbols from statically linked libraries. |
| 76 '-Wl,--exclude-libs=ALL', |
| 77 ], |
| 78 }], |
| 69 ['OS=="mac"', { | 79 ['OS=="mac"', { |
| 70 'xcode_settings': { | 80 'xcode_settings': { |
| 71 # Make it a run-path dependent library. | 81 # Make it a run-path dependent library. |
| 72 'DYLIB_INSTALL_NAME_BASE': '@loader_path', | 82 'DYLIB_INSTALL_NAME_BASE': '@loader_path', |
| 73 }, | 83 }, |
| 74 }], | 84 }], |
| 75 ], | 85 ], |
| 76 }, | 86 }, |
| 77 { | 87 { |
| 78 'target_name': 'mojo_test_support', | 88 'target_name': 'mojo_test_support', |
| 79 'type': 'shared_library', | 89 'type': 'shared_library', |
| 80 'defines': [ | 90 'defines': [ |
| 81 'MOJO_TEST_SUPPORT_IMPLEMENTATION', | 91 'MOJO_TEST_SUPPORT_IMPLEMENTATION', |
| 82 ], | 92 ], |
| 83 'include_dirs': [ | 93 'include_dirs': [ |
| 84 '..', | 94 '..', |
| 85 ], | 95 ], |
| 86 'direct_dependent_settings': { | 96 'direct_dependent_settings': { |
| 87 'include_dirs': [ | 97 'include_dirs': [ |
| 88 '..', | 98 '..', |
| 89 ], | 99 ], |
| 90 }, | 100 }, |
| 91 'sources': [ | 101 'sources': [ |
| 92 'public/c/test_support/test_support.h', | 102 'public/c/test_support/test_support.h', |
| 93 'public/c/test_support/test_support_export.h', | 103 'public/c/test_support/test_support_export.h', |
| 94 'public/tests/test_support_private.cc', | 104 'public/tests/test_support_private.cc', |
| 95 'public/tests/test_support_private.h', | 105 'public/tests/test_support_private.h', |
| 96 ], | 106 ], |
| 97 'conditions': [ | 107 'conditions': [ |
| 108 ['OS=="android"', { |
| 109 'ldflags!': [ |
| 110 # Remove default export list because this lib has different exports. |
| 111 '-Wl,--version-script=<(android_linker_script)', |
| 112 ], |
| 113 'ldflags': [ |
| 114 # Don't export symbols from statically linked libraries. |
| 115 '-Wl,--exclude-libs=ALL', |
| 116 ], |
| 117 }], |
| 98 ['OS=="mac"', { | 118 ['OS=="mac"', { |
| 99 'xcode_settings': { | 119 'xcode_settings': { |
| 100 # Make it a run-path dependent library. | 120 # Make it a run-path dependent library. |
| 101 'DYLIB_INSTALL_NAME_BASE': '@loader_path', | 121 'DYLIB_INSTALL_NAME_BASE': '@loader_path', |
| 102 }, | 122 }, |
| 103 }], | 123 }], |
| 104 ], | 124 ], |
| 105 }, | 125 }, |
| 106 { | 126 { |
| 107 'target_name': 'mojo_public_test_utils', | 127 'target_name': 'mojo_public_test_utils', |
| (...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 402 }, | 422 }, |
| 403 'dependencies': [ | 423 'dependencies': [ |
| 404 'mojo_public_java', | 424 'mojo_public_java', |
| 405 ], | 425 ], |
| 406 'includes': [ '../build/java.gypi' ], | 426 'includes': [ '../build/java.gypi' ], |
| 407 }, | 427 }, |
| 408 ], | 428 ], |
| 409 }], | 429 }], |
| 410 ], | 430 ], |
| 411 } | 431 } |
| OLD | NEW |