 Chromium Code Reviews
 Chromium Code Reviews Issue 1815483003:
  bluetooth: Create Mojo equivalent of SetBluetoothMockDataSet  (Closed) 
  Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth-mojo
    
  
    Issue 1815483003:
  bluetooth: Create Mojo equivalent of SetBluetoothMockDataSet  (Closed) 
  Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth-mojo| OLD | NEW | 
|---|---|
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 'content_shell_product_name': 'Content Shell', | 7 'content_shell_product_name': 'Content Shell', | 
| 8 'content_shell_version': '99.77.34.5', | 8 'content_shell_version': '99.77.34.5', | 
| 9 }, | 9 }, | 
| 10 'targets': [ | 10 'targets': [ | 
| 11 { | 11 { | 
| 12 # GN version: //content/shell:content_shell_lib | 12 # GN version: //content/shell:content_shell_lib | 
| 13 'target_name': 'content_shell_lib', | 13 'target_name': 'content_shell_lib', | 
| 14 'type': 'static_library', | 14 'type': 'static_library', | 
| 15 'defines': ['CONTENT_SHELL_VERSION="<(content_shell_version)"'], | 15 'defines': ['CONTENT_SHELL_VERSION="<(content_shell_version)"'], | 
| 16 'variables': { | 16 'variables': { | 
| 17 'chromium_code': 1, | 17 'chromium_code': 1, | 
| 18 # TODO(thakis): Remove this once http://crbug.com/383820 is figured out | 18 # TODO(thakis): Remove this once http://crbug.com/383820 is figured out | 
| 19 'clang_warning_flags': [ '-Wno-nonnull' ], | 19 'clang_warning_flags': [ '-Wno-nonnull' ], | 
| 20 }, | 20 }, | 
| 21 'dependencies': [ | 21 'dependencies': [ | 
| 22 'content_shell_mojo_bindings', | |
| 
Jeffrey Yasskin
2016/03/24 23:47:54
Sort this, I think.
 
ortuno
2016/03/28 23:26:44
Done.
 | |
| 22 'app/resources/content_resources.gyp:content_resources', | 23 'app/resources/content_resources.gyp:content_resources', | 
| 23 'app/strings/content_strings.gyp:content_strings', | 24 'app/strings/content_strings.gyp:content_strings', | 
| 24 'content.gyp:content_app_both', | 25 'content.gyp:content_app_both', | 
| 25 'content.gyp:content_browser', | 26 'content.gyp:content_browser', | 
| 26 'content.gyp:content_common', | 27 'content.gyp:content_common', | 
| 27 'content.gyp:content_gpu', | 28 'content.gyp:content_gpu', | 
| 28 'content.gyp:content_plugin', | 29 'content.gyp:content_plugin', | 
| 29 'content.gyp:content_ppapi_plugin', | 30 'content.gyp:content_ppapi_plugin', | 
| 30 'content.gyp:content_renderer', | 31 'content.gyp:content_renderer', | 
| 31 'content.gyp:content_resources', | 32 'content.gyp:content_resources', | 
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 94 'shell/app/shell_crash_reporter_client.cc', | 95 'shell/app/shell_crash_reporter_client.cc', | 
| 95 'shell/app/shell_crash_reporter_client.h', | 96 'shell/app/shell_crash_reporter_client.h', | 
| 96 'shell/app/shell_main_delegate.cc', | 97 'shell/app/shell_main_delegate.cc', | 
| 97 'shell/app/shell_main_delegate.h', | 98 'shell/app/shell_main_delegate.h', | 
| 98 'shell/app/shell_main_delegate_mac.h', | 99 'shell/app/shell_main_delegate_mac.h', | 
| 99 'shell/app/shell_main_delegate_mac.mm', | 100 'shell/app/shell_main_delegate_mac.mm', | 
| 100 'shell/browser/layout_test/blink_test_controller.cc', | 101 'shell/browser/layout_test/blink_test_controller.cc', | 
| 101 'shell/browser/layout_test/blink_test_controller.h', | 102 'shell/browser/layout_test/blink_test_controller.h', | 
| 102 'shell/browser/layout_test/layout_test_android.cc', | 103 'shell/browser/layout_test/layout_test_android.cc', | 
| 103 'shell/browser/layout_test/layout_test_android.h', | 104 'shell/browser/layout_test/layout_test_android.h', | 
| 105 'shell/browser/layout_test/layout_test_bluetooth_fake_adapter_setter_imp l.cc', | |
| 106 'shell/browser/layout_test/layout_test_bluetooth_fake_adapter_setter_imp l.h', | |
| 104 'shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc', | 107 'shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc', | 
| 105 'shell/browser/layout_test/layout_test_bluetooth_adapter_provider.h', | 108 'shell/browser/layout_test/layout_test_bluetooth_adapter_provider.h', | 
| 106 'shell/browser/layout_test/layout_test_bluetooth_chooser_factory.cc', | 109 'shell/browser/layout_test/layout_test_bluetooth_chooser_factory.cc', | 
| 107 'shell/browser/layout_test/layout_test_bluetooth_chooser_factory.h', | 110 'shell/browser/layout_test/layout_test_bluetooth_chooser_factory.h', | 
| 108 'shell/browser/layout_test/layout_test_browser_context.cc', | 111 'shell/browser/layout_test/layout_test_browser_context.cc', | 
| 109 'shell/browser/layout_test/layout_test_browser_context.h', | 112 'shell/browser/layout_test/layout_test_browser_context.h', | 
| 110 'shell/browser/layout_test/layout_test_browser_main.cc', | 113 'shell/browser/layout_test/layout_test_browser_main.cc', | 
| 111 'shell/browser/layout_test/layout_test_browser_main.h', | 114 'shell/browser/layout_test/layout_test_browser_main.h', | 
| 112 'shell/browser/layout_test/layout_test_browser_main_parts.cc', | 115 'shell/browser/layout_test/layout_test_browser_main_parts.cc', | 
| 113 'shell/browser/layout_test/layout_test_browser_main_parts.h', | 116 'shell/browser/layout_test/layout_test_browser_main_parts.h', | 
| (...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 634 'files': ['<(PRODUCT_DIR)/np_test_netscape_plugin.dll'], | 637 'files': ['<(PRODUCT_DIR)/np_test_netscape_plugin.dll'], | 
| 635 }], | 638 }], | 
| 636 }], | 639 }], | 
| 637 ['OS=="mac"', { | 640 ['OS=="mac"', { | 
| 638 'copies': [{ | 641 'copies': [{ | 
| 639 'destination': '<(PRODUCT_DIR)/plugins/', | 642 'destination': '<(PRODUCT_DIR)/plugins/', | 
| 640 'files': ['<(PRODUCT_DIR)/test_netscape_plugin.plugin/'], | 643 'files': ['<(PRODUCT_DIR)/test_netscape_plugin.plugin/'], | 
| 641 }], | 644 }], | 
| 642 }], | 645 }], | 
| 643 ], | 646 ], | 
| 644 } | 647 }, | 
| 648 { | |
| 649 'target_name': 'content_shell_mojo_bindings_mojom', | |
| 
Jeffrey Yasskin
2016/03/24 23:47:53
I don't know enough GYP to understand why this has
 
ortuno
2016/03/28 23:26:44
Yeah, otherwise component builds don't work...
 | |
| 650 'type': 'none', | |
| 651 'variables': { | |
| 652 'mojom_files': [ | |
| 653 'shell/common/layout_test/layout_test_bluetooth_fake_adapter_setter.m ojom' | |
| 654 ], | |
| 655 }, | |
| 656 'includes': [ | |
| 657 '../mojo/mojom_bindings_generator_explicit.gypi', | |
| 658 ], | |
| 659 }, | |
| 660 { | |
| 661 'target_name': 'content_shell_mojo_bindings', | |
| 662 'type': 'static_library', | |
| 663 'dependencies': [ | |
| 664 'content_shell_mojo_bindings_mojom', | |
| 665 '../mojo/mojo_public.gyp:mojo_cpp_bindings', | |
| 666 ], | |
| 667 }, | |
| 645 ], | 668 ], | 
| 646 'conditions': [ | 669 'conditions': [ | 
| 647 ['OS=="mac"', { | 670 ['OS=="mac"', { | 
| 648 'targets': [ | 671 'targets': [ | 
| 649 { | 672 { | 
| 650 # GN version: //content/shell:framework | 673 # GN version: //content/shell:framework | 
| 651 'target_name': 'content_shell_framework', | 674 'target_name': 'content_shell_framework', | 
| 652 'type': 'shared_library', | 675 'type': 'shared_library', | 
| 653 'product_name': '<(content_shell_product_name) Framework', | 676 'product_name': '<(content_shell_product_name) Framework', | 
| 654 'mac_bundle': 1, | 677 'mac_bundle': 1, | 
| (...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 977 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb', | 1000 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb', | 
| 978 '--destination_dir', '<(dest_dir)', | 1001 '--destination_dir', '<(dest_dir)', | 
| 979 ], | 1002 ], | 
| 980 }, | 1003 }, | 
| 981 ], | 1004 ], | 
| 982 }, | 1005 }, | 
| 983 ], | 1006 ], | 
| 984 }], # OS=="win" and fastbuild==0 and target_arch=="ia32" | 1007 }], # OS=="win" and fastbuild==0 and target_arch=="ia32" | 
| 985 ] | 1008 ] | 
| 986 } | 1009 } | 
| OLD | NEW |