| OLD | NEW |
| 1 # Copyright 2016 The Chromium Authors. All rights reserved. | 1 # Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 'mojo_public_test_interfaces_mojom_files': [ | 8 'mojo_public_test_interfaces_mojom_files': [ |
| 9 'public/interfaces/bindings/tests/math_calculator.mojom', | 9 'public/interfaces/bindings/tests/math_calculator.mojom', |
| 10 'public/interfaces/bindings/tests/no_module.mojom', | 10 'public/interfaces/bindings/tests/no_module.mojom', |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 'mojom_files': [ | 36 'mojom_files': [ |
| 37 'public/interfaces/bindings/tests/test_structs.mojom', | 37 'public/interfaces/bindings/tests/test_structs.mojom', |
| 38 'public/interfaces/bindings/tests/test_unions.mojom', | 38 'public/interfaces/bindings/tests/test_unions.mojom', |
| 39 'public/interfaces/bindings/tests/validation_test_interfaces.mojom', | 39 'public/interfaces/bindings/tests/validation_test_interfaces.mojom', |
| 40 '<@(mojo_public_test_interfaces_mojom_files)', | 40 '<@(mojo_public_test_interfaces_mojom_files)', |
| 41 ], | 41 ], |
| 42 'mojom_typemaps': [ | 42 'mojom_typemaps': [ |
| 43 'public/cpp/bindings/tests/rect_chromium.typemap', | 43 'public/cpp/bindings/tests/rect_chromium.typemap', |
| 44 'public/cpp/bindings/tests/test_native_types_chromium.typemap', | 44 'public/cpp/bindings/tests/test_native_types_chromium.typemap', |
| 45 ], | 45 ], |
| 46 'use_new_wrapper_types': 'true', |
| 46 }, | 47 }, |
| 47 'includes': [ 'mojom_bindings_generator_explicit.gypi' ], | 48 'includes': [ 'mojom_bindings_generator_explicit.gypi' ], |
| 48 }, | 49 }, |
| 49 { | 50 { |
| 50 'target_name': 'mojo_public_test_interfaces_struct_traits', | 51 'target_name': 'mojo_public_test_interfaces_struct_traits', |
| 51 'type': 'static_library', | 52 'type': 'static_library', |
| 52 'variables': { | 53 'variables': { |
| 53 'mojom_typemaps': [ | 54 'mojom_typemaps': [ |
| 54 'public/cpp/bindings/tests/struct_with_traits.typemap', | 55 'public/cpp/bindings/tests/struct_with_traits.typemap', |
| 55 ], | 56 ], |
| 57 'use_new_wrapper_types': 'true', |
| 56 }, | 58 }, |
| 57 'sources': [ | 59 'sources': [ |
| 58 'public/interfaces/bindings/tests/struct_with_traits.mojom', | 60 'public/interfaces/bindings/tests/struct_with_traits.mojom', |
| 59 'public/cpp/bindings/tests/struct_with_traits_impl_traits.cc', | 61 'public/cpp/bindings/tests/struct_with_traits_impl_traits.cc', |
| 60 ], | 62 ], |
| 61 'includes': [ 'mojom_bindings_generator.gypi' ], | 63 'includes': [ 'mojom_bindings_generator.gypi' ], |
| 62 }, | 64 }, |
| 63 { | 65 { |
| 64 # GN version: //mojo/public/interfaces/bindings/tests:test_interfaces | 66 # GN version: //mojo/public/interfaces/bindings/tests:test_interfaces |
| 65 'target_name': 'mojo_public_test_interfaces', | 67 'target_name': 'mojo_public_test_interfaces', |
| (...skipping 14 matching lines...) Expand all Loading... |
| 80 'target_name': 'mojo_public_test_associated_interfaces_mojom', | 82 'target_name': 'mojo_public_test_associated_interfaces_mojom', |
| 81 'type': 'none', | 83 'type': 'none', |
| 82 'variables': { | 84 'variables': { |
| 83 # These files are not included in the mojo_public_test_interfaces_mojom | 85 # These files are not included in the mojo_public_test_interfaces_mojom |
| 84 # target because associated interfaces are not supported by all bindings | 86 # target because associated interfaces are not supported by all bindings |
| 85 # languages yet. | 87 # languages yet. |
| 86 'mojom_files': [ | 88 'mojom_files': [ |
| 87 'public/interfaces/bindings/tests/test_associated_interfaces.mojom', | 89 'public/interfaces/bindings/tests/test_associated_interfaces.mojom', |
| 88 'public/interfaces/bindings/tests/validation_test_associated_interface
s.mojom', | 90 'public/interfaces/bindings/tests/validation_test_associated_interface
s.mojom', |
| 89 ], | 91 ], |
| 92 'use_new_wrapper_types': 'true', |
| 90 }, | 93 }, |
| 91 'includes': [ 'mojom_bindings_generator_explicit.gypi' ], | 94 'includes': [ 'mojom_bindings_generator_explicit.gypi' ], |
| 92 }, | 95 }, |
| 93 { | 96 { |
| 94 # GN version: //mojo/public/interfaces/bindings/tests:test_associated_inte
rfaces | 97 # GN version: //mojo/public/interfaces/bindings/tests:test_associated_inte
rfaces |
| 95 'target_name': 'mojo_public_test_associated_interfaces', | 98 'target_name': 'mojo_public_test_associated_interfaces', |
| 96 'type': 'static_library', | 99 'type': 'static_library', |
| 97 'export_dependent_settings': [ | 100 'export_dependent_settings': [ |
| 98 'mojo_public.gyp:mojo_cpp_bindings', | 101 'mojo_public.gyp:mojo_cpp_bindings', |
| 99 ], | 102 ], |
| 100 'dependencies': [ | 103 'dependencies': [ |
| 101 'mojo_public.gyp:mojo_cpp_bindings', | 104 'mojo_public.gyp:mojo_cpp_bindings', |
| 102 'mojo_public_test_associated_interfaces_mojom', | 105 'mojo_public_test_associated_interfaces_mojom', |
| 103 ], | 106 ], |
| 104 }, | 107 }, |
| 105 { | 108 { |
| 106 'target_name': 'mojo_public_test_wtf_types', | 109 'target_name': 'mojo_public_test_wtf_types', |
| 107 'type': 'static_library', | 110 'type': 'static_library', |
| 108 'sources': [ | 111 'sources': [ |
| 109 'public/interfaces/bindings/tests/test_wtf_types.mojom', | 112 'public/interfaces/bindings/tests/test_wtf_types.mojom', |
| 110 ], | 113 ], |
| 114 'variables': { |
| 115 'use_new_wrapper_types': 'true', |
| 116 }, |
| 111 'includes': [ 'mojom_bindings_generator.gypi' ], | 117 'includes': [ 'mojom_bindings_generator.gypi' ], |
| 112 }, | 118 }, |
| 113 ], | 119 ], |
| 114 'conditions': [ | 120 'conditions': [ |
| 115 ['OS != "ios"', { | 121 ['OS != "ios"', { |
| 116 'targets': [ | 122 'targets': [ |
| 117 { | 123 { |
| 118 'target_name': 'mojo_public_test_interfaces_mojom_blink', | 124 'target_name': 'mojo_public_test_interfaces_mojom_blink', |
| 119 'type': 'none', | 125 'type': 'none', |
| 120 'variables': { | 126 'variables': { |
| 121 'for_blink': 'true', | 127 'for_blink': 'true', |
| 122 'mojom_typemaps': [ | 128 'mojom_typemaps': [ |
| 123 'public/cpp/bindings/tests/rect_blink.typemap', | 129 'public/cpp/bindings/tests/rect_blink.typemap', |
| 124 'public/cpp/bindings/tests/test_native_types_blink.typemap', | 130 'public/cpp/bindings/tests/test_native_types_blink.typemap', |
| 125 ], | 131 ], |
| 126 'mojom_files': '<(mojo_public_test_interfaces_mojom_files)', | 132 'mojom_files': '<(mojo_public_test_interfaces_mojom_files)', |
| 133 'use_new_wrapper_types': 'true', |
| 127 }, | 134 }, |
| 128 'includes': [ 'mojom_bindings_generator_explicit.gypi' ], | 135 'includes': [ 'mojom_bindings_generator_explicit.gypi' ], |
| 129 }, | 136 }, |
| 130 { | 137 { |
| 131 # GN version: //mojo/public/interfaces/bindings/tests:test_interfaces_
blink | 138 # GN version: //mojo/public/interfaces/bindings/tests:test_interfaces_
blink |
| 132 'target_name': 'mojo_public_test_interfaces_blink', | 139 'target_name': 'mojo_public_test_interfaces_blink', |
| 133 'type': 'static_library', | 140 'type': 'static_library', |
| 134 'export_dependent_settings': [ | 141 'export_dependent_settings': [ |
| 135 'mojo_public.gyp:mojo_cpp_bindings', | 142 'mojo_public.gyp:mojo_cpp_bindings', |
| 136 'mojo_public_test_interfaces_mojom_blink', | 143 'mojo_public_test_interfaces_mojom_blink', |
| 137 ], | 144 ], |
| 138 'sources': [ | 145 'sources': [ |
| 139 'public/cpp/bindings/tests/pickled_types_blink.cc', | 146 'public/cpp/bindings/tests/pickled_types_blink.cc', |
| 140 ], | 147 ], |
| 141 'dependencies': [ | 148 'dependencies': [ |
| 142 '../ipc/ipc.gyp:ipc', | 149 '../ipc/ipc.gyp:ipc', |
| 143 'mojo_public.gyp:mojo_cpp_bindings', | 150 'mojo_public.gyp:mojo_cpp_bindings', |
| 144 'mojo_public_test_interfaces_mojom_blink', | 151 'mojo_public_test_interfaces_mojom_blink', |
| 145 ], | 152 ], |
| 146 }, | 153 }, |
| 147 { | 154 { |
| 148 'target_name': 'mojo_public_test_wtf_types_blink', | 155 'target_name': 'mojo_public_test_wtf_types_blink', |
| 149 'type': 'static_library', | 156 'type': 'static_library', |
| 150 'variables': { | 157 'variables': { |
| 151 'for_blink': 'true', | 158 'for_blink': 'true', |
| 159 'use_new_wrapper_types': 'true', |
| 152 }, | 160 }, |
| 153 'sources': [ | 161 'sources': [ |
| 154 'public/interfaces/bindings/tests/test_wtf_types.mojom', | 162 'public/interfaces/bindings/tests/test_wtf_types.mojom', |
| 155 ], | 163 ], |
| 156 'includes': [ 'mojom_bindings_generator.gypi' ], | 164 'includes': [ 'mojom_bindings_generator.gypi' ], |
| 157 }, | 165 }, |
| 158 ], | 166 ], |
| 159 }], | 167 }], |
| 160 ], | 168 ], |
| 161 } | 169 } |
| 162 | 170 |
| OLD | NEW |