| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 'includes': [ | 6 'includes': [ |
| 7 'mojo_variables.gypi', | 7 'mojo_variables.gypi', |
| 8 ], | 8 ], |
| 9 'target_defaults' : { | 9 'target_defaults' : { |
| 10 'include_dirs': [ | 10 'include_dirs': [ |
| (...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 232 # This comes from the mojo_interface_bindings_cpp_sources dependency. | 232 # This comes from the mojo_interface_bindings_cpp_sources dependency. |
| 233 '>@(mojom_generated_sources)', | 233 '>@(mojom_generated_sources)', |
| 234 ], | 234 ], |
| 235 'dependencies': [ | 235 'dependencies': [ |
| 236 '../base/base.gyp:base', | 236 '../base/base.gyp:base', |
| 237 'mojo_cpp_system', | 237 'mojo_cpp_system', |
| 238 'mojo_interface_bindings_cpp_sources', | 238 'mojo_interface_bindings_cpp_sources', |
| 239 ], | 239 ], |
| 240 }, | 240 }, |
| 241 { | 241 { |
| 242 # TODO(yzshen): crbug.com/617718 Consider moving this into blink. |
| 242 # GN version: //mojo/public/cpp/bindings:wtf_support | 243 # GN version: //mojo/public/cpp/bindings:wtf_support |
| 243 'target_name': 'mojo_cpp_bindings_wtf_support', | 244 'target_name': 'mojo_cpp_bindings_wtf_support', |
| 244 'type': 'static_library', | 245 'type': 'static_library', |
| 245 'include_dirs': [ | 246 'include_dirs': [ |
| 246 '..' | 247 '..' |
| 247 ], | 248 ], |
| 248 'sources': [ | 249 'sources': [ |
| 249 'public/cpp/bindings/array_traits_wtf.h', | 250 'public/cpp/bindings/array_traits_wtf.h', |
| 250 'public/cpp/bindings/array_traits_wtf_vector.h', | 251 'public/cpp/bindings/array_traits_wtf_vector.h', |
| 251 'public/cpp/bindings/lib/string_traits_wtf.cc', | 252 'public/cpp/bindings/lib/string_traits_wtf.cc', |
| 252 'public/cpp/bindings/lib/wtf_serialization.h', | 253 'public/cpp/bindings/lib/wtf_serialization.h', |
| 253 'public/cpp/bindings/string_traits_wtf.h', | 254 'public/cpp/bindings/string_traits_wtf.h', |
| 254 'public/cpp/bindings/wtf_array.h', | 255 'public/cpp/bindings/wtf_array.h', |
| 255 ], | 256 ], |
| 256 'dependencies': [ | 257 'dependencies': [ |
| 257 'mojo_cpp_bindings', | 258 'mojo_cpp_bindings', |
| 258 '../third_party/WebKit/Source/config.gyp:config', | 259 '../third_party/WebKit/Source/config.gyp:config', |
| 259 '../third_party/WebKit/Source/wtf/wtf.gyp:wtf', | 260 '../third_party/WebKit/Source/wtf/wtf.gyp:wtf', |
| 260 ], | 261 ], |
| 261 'export_dependent_settings': [ | 262 'export_dependent_settings': [ |
| 262 'mojo_cpp_bindings', | 263 'mojo_cpp_bindings', |
| 263 '../third_party/WebKit/Source/config.gyp:config', | 264 '../third_party/WebKit/Source/config.gyp:config', |
| 264 ], | 265 ], |
| 265 'direct_dependent_settings': { | |
| 266 'variables': { | |
| 267 'clang_warning_flags_unset': [ '-Wglobal-constructors' ], | |
| 268 }, | |
| 269 }, | |
| 270 }, | 266 }, |
| 271 { | 267 { |
| 272 # GN version: //mojo/message_pump | 268 # GN version: //mojo/message_pump |
| 273 'target_name': 'mojo_message_pump_lib', | 269 'target_name': 'mojo_message_pump_lib', |
| 274 'type': '<(component)', | 270 'type': '<(component)', |
| 275 'defines': [ | 271 'defines': [ |
| 276 'MOJO_MESSAGE_PUMP_IMPLEMENTATION', | 272 'MOJO_MESSAGE_PUMP_IMPLEMENTATION', |
| 277 ], | 273 ], |
| 278 'dependencies': [ | 274 'dependencies': [ |
| 279 '../base/base.gyp:base', | 275 '../base/base.gyp:base', |
| (...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 533 'mojo_interface_bindings_java_sources', | 529 'mojo_interface_bindings_java_sources', |
| 534 'mojo_public_java', | 530 'mojo_public_java', |
| 535 '<(DEPTH)/base/base.gyp:base_java', | 531 '<(DEPTH)/base/base.gyp:base_java', |
| 536 ], | 532 ], |
| 537 'includes': [ '../build/java.gypi' ], | 533 'includes': [ '../build/java.gypi' ], |
| 538 }, | 534 }, |
| 539 ], | 535 ], |
| 540 }], | 536 }], |
| 541 ], | 537 ], |
| 542 } | 538 } |
| OLD | NEW |