Chromium Code Reviews| 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 401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 412 'sources': [ | 412 'sources': [ |
| 413 'public/interfaces/bindings/tests/struct_with_traits.mojom', | 413 'public/interfaces/bindings/tests/struct_with_traits.mojom', |
| 414 'public/cpp/bindings/tests/struct_with_traits_impl_traits.cc', | 414 'public/cpp/bindings/tests/struct_with_traits_impl_traits.cc', |
| 415 ], | 415 ], |
| 416 'includes': [ 'mojom_bindings_generator.gypi' ], | 416 'includes': [ 'mojom_bindings_generator.gypi' ], |
| 417 }, | 417 }, |
| 418 { | 418 { |
| 419 'target_name': 'mojo_public_test_interfaces_mojom_blink', | 419 'target_name': 'mojo_public_test_interfaces_mojom_blink', |
| 420 'type': 'none', | 420 'type': 'none', |
| 421 'variables': { | 421 'variables': { |
| 422 'mojom_variant': 'wtf', | 422 'mojom_variant': 'blink', |
|
yzshen1
2016/04/20 17:47:33
Now that we use a fixed variant in GN, maybe we sh
Sam McNally
2016/04/21 06:05:20
Done.
| |
| 423 'for_blink': 'true', | 423 'for_blink': 'true', |
| 424 'mojom_typemaps': [ | 424 'mojom_typemaps': [ |
| 425 'public/cpp/bindings/tests/rect_blink.typemap', | 425 'public/cpp/bindings/tests/rect_blink.typemap', |
| 426 'public/cpp/bindings/tests/test_native_types_blink.typemap', | 426 'public/cpp/bindings/tests/test_native_types_blink.typemap', |
| 427 ], | 427 ], |
| 428 'mojom_files': '<(mojo_public_test_interfaces_mojom_files)', | 428 'mojom_files': '<(mojo_public_test_interfaces_mojom_files)', |
| 429 }, | 429 }, |
| 430 'includes': [ 'mojom_bindings_generator_explicit.gypi' ], | 430 'includes': [ 'mojom_bindings_generator_explicit.gypi' ], |
| 431 }, | 431 }, |
| 432 { | 432 { |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 491 'type': 'static_library', | 491 'type': 'static_library', |
| 492 'sources': [ | 492 'sources': [ |
| 493 'public/interfaces/bindings/tests/test_wtf_types.mojom', | 493 'public/interfaces/bindings/tests/test_wtf_types.mojom', |
| 494 ], | 494 ], |
| 495 'includes': [ 'mojom_bindings_generator.gypi' ], | 495 'includes': [ 'mojom_bindings_generator.gypi' ], |
| 496 }, | 496 }, |
| 497 { | 497 { |
| 498 'target_name': 'mojo_public_test_wtf_types_blink', | 498 'target_name': 'mojo_public_test_wtf_types_blink', |
| 499 'type': 'static_library', | 499 'type': 'static_library', |
| 500 'variables': { | 500 'variables': { |
| 501 'mojom_variant': 'wtf', | 501 'mojom_variant': 'blink', |
| 502 'for_blink': 'true', | 502 'for_blink': 'true', |
| 503 }, | 503 }, |
| 504 'sources': [ | 504 'sources': [ |
| 505 'public/interfaces/bindings/tests/test_wtf_types.mojom', | 505 'public/interfaces/bindings/tests/test_wtf_types.mojom', |
| 506 ], | 506 ], |
| 507 'includes': [ 'mojom_bindings_generator.gypi' ], | 507 'includes': [ 'mojom_bindings_generator.gypi' ], |
| 508 }, | 508 }, |
| 509 ], | 509 ], |
| 510 'conditions': [ | 510 'conditions': [ |
| 511 ['OS == "android"', { | 511 ['OS == "android"', { |
| (...skipping 27 matching lines...) Expand all Loading... | |
| 539 'mojo_interface_bindings_java_sources', | 539 'mojo_interface_bindings_java_sources', |
| 540 'mojo_public_java', | 540 'mojo_public_java', |
| 541 '<(DEPTH)/base/base.gyp:base_java', | 541 '<(DEPTH)/base/base.gyp:base_java', |
| 542 ], | 542 ], |
| 543 'includes': [ '../build/java.gypi' ], | 543 'includes': [ '../build/java.gypi' ], |
| 544 }, | 544 }, |
| 545 ], | 545 ], |
| 546 }], | 546 }], |
| 547 ], | 547 ], |
| 548 } | 548 } |
| OLD | NEW |