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

Unified Diff: content/content_common_mojo_bindings.gyp

Issue 1624573004: Rename webusb_permission_bubble.mojom and move it to //content/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: added content_common_mojo_bindings dep back to chrome_browser.gypi Created 4 years, 11 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
« no previous file with comments | « content/content_app.gypi ('k') | content/content_renderer.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_common_mojo_bindings.gyp
diff --git a/content/content_common_mojo_bindings.gyp b/content/content_common_mojo_bindings.gyp
index f82059615ef7f989b900f690f45c249dad533eec..c4faa541ceed5fcbe8dfb71cb3d02403eece8eb4 100644
--- a/content/content_common_mojo_bindings.gyp
+++ b/content/content_common_mojo_bindings.gyp
@@ -33,6 +33,13 @@
],
},
'includes': [ '../third_party/mojo/mojom_bindings_generator_explicit.gypi' ],
+ 'conditions': [
+ ['OS!="ios"', {
+ 'dependencies': [
+ 'content_web_usb_permission_request_mojo_bindings_mojom',
+ ],
+ }],
+ ],
},
{
'target_name': 'content_common_mojo_bindings',
@@ -45,7 +52,45 @@
'../skia/skia.gyp:skia_mojo',
'../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
'../ui/mojo/geometry/mojo_bindings.gyp:mojo_geometry_bindings',
- ]
+ ],
+ 'conditions': [
+ ['OS!="ios"', {
+ 'dependencies': [
+ 'content_web_usb_permission_request_mojo_bindings',
+ ],
+ }],
+ ],
+ },
+ {
+ 'target_name': 'content_web_usb_permission_request_mojo_bindings_mojom',
jam 2016/01/29 17:58:53 why are you adding new targets instead of using th
jam 2016/02/26 21:40:11 just add a comment that says you're adding this on
+ 'type': 'none',
+ 'conditions': [
+ ['OS!="ios"', {
+ 'variables': {
+ 'mojom_files': [
+ 'public/common/web_usb_permission_request.mojom',
+ ],
+ 'dependencies': [
+ '../device/devices_app/devices_app.gyp:device_usb_mojo_bindings',
+ ],
+ },
+ 'includes': [
+ '../third_party/mojo/mojom_bindings_generator_explicit.gypi',
+ ],
+ }],
+ ],
+ },
+ {
+ 'target_name': 'content_web_usb_permission_request_mojo_bindings',
+ 'type': 'static_library',
+ 'conditions': [
+ ['OS!="ios"', {
+ 'dependencies': [
+ 'content_web_usb_permission_request_mojo_bindings_mojom',
+ '../device/devices_app/devices_app.gyp:device_usb_mojo_bindings_lib',
+ ],
+ }],
+ ],
},
]
}
« no previous file with comments | « content/content_app.gypi ('k') | content/content_renderer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698