Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1032)

Unified Diff: content/content_shell.gypi

Issue 1815483003: bluetooth: Create Mojo equivalent of SetBluetoothMockDataSet (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth-mojo
Patch Set: Add gyp Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/content_shell.gypi
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index dff8369ab87955d2698acf988463fc032f1f5745..945c560beb37a8a64c16784dacdce71393ce765f 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -19,6 +19,7 @@
'clang_warning_flags': [ '-Wno-nonnull' ],
},
'dependencies': [
+ 'content_shell_mojo_bindings',
Jeffrey Yasskin 2016/03/24 23:47:54 Sort this, I think.
ortuno 2016/03/28 23:26:44 Done.
'app/resources/content_resources.gyp:content_resources',
'app/strings/content_strings.gyp:content_strings',
'content.gyp:content_app_both',
@@ -101,6 +102,8 @@
'shell/browser/layout_test/blink_test_controller.h',
'shell/browser/layout_test/layout_test_android.cc',
'shell/browser/layout_test/layout_test_android.h',
+ 'shell/browser/layout_test/layout_test_bluetooth_fake_adapter_setter_impl.cc',
+ 'shell/browser/layout_test/layout_test_bluetooth_fake_adapter_setter_impl.h',
'shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc',
'shell/browser/layout_test/layout_test_bluetooth_adapter_provider.h',
'shell/browser/layout_test/layout_test_bluetooth_chooser_factory.cc',
@@ -641,7 +644,27 @@
}],
}],
],
- }
+ },
+ {
+ '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...
+ 'type': 'none',
+ 'variables': {
+ 'mojom_files': [
+ 'shell/common/layout_test/layout_test_bluetooth_fake_adapter_setter.mojom'
+ ],
+ },
+ 'includes': [
+ '../mojo/mojom_bindings_generator_explicit.gypi',
+ ],
+ },
+ {
+ 'target_name': 'content_shell_mojo_bindings',
+ 'type': 'static_library',
+ 'dependencies': [
+ 'content_shell_mojo_bindings_mojom',
+ '../mojo/mojo_public.gyp:mojo_cpp_bindings',
+ ],
+ },
],
'conditions': [
['OS=="mac"', {

Powered by Google App Engine
This is Rietveld 408576698