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

Unified Diff: content/content_common_mojo_bindings.gypi

Issue 728133002: Update mojo sdk to rev e01f9a49449381a5eb430c1fd88bf2cae73ec35a (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: android + ios gyp fixes Created 6 years, 1 month 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_common.gypi ('k') | content/content_gpu.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_common_mojo_bindings.gypi
diff --git a/content/content_common_mojo_bindings.gypi b/content/content_common_mojo_bindings.gypi
index ebff805636ec491b5fb542da2f482dacd202054e..cb0098cbdbed328424851ba99ed2427909185eda 100644
--- a/content/content_common_mojo_bindings.gypi
+++ b/content/content_common_mojo_bindings.gypi
@@ -5,29 +5,32 @@
{
'targets': [
{
+ 'target_name': 'content_common_mojo_bindings_mojom',
+ 'type': 'none',
+ 'variables': {
+ 'mojom_files': [
+ # NOTE: Sources duplicated in //content/common/BUILD.gn:mojo_bindings.
+ 'common/geolocation_service.mojom',
+ 'common/permission_service.mojom',
+ 'common/render_frame_setup.mojom',
+
+ # NOTE: Sources duplicated in
+ # //content/public/common/BUILD.gn:mojo_bindings.
+ 'public/common/mojo_geoposition.mojom',
+ ],
+ },
+ 'includes': [ '../mojo/public/tools/bindings/mojom_bindings_generator_explicit.gypi' ],
+ },
+ {
'target_name': 'content_common_mojo_bindings',
'type': 'static_library',
+ 'variables': { 'enable_wexit_time_destructors': 1, },
'dependencies': [
+ 'content_common_mojo_bindings_mojom',
'../mojo/mojo_base.gyp:mojo_environment_chromium',
'../mojo/public/mojo_public.gyp:mojo_application_bindings',
'../mojo/public/mojo_public.gyp:mojo_cpp_bindings',
- ],
- 'sources': [
- # NOTE: Sources duplicated in //content/common/BUILD.gn:mojo_bindings.
- 'common/geolocation_service.mojom',
- 'common/permission_service.mojom',
- 'common/render_frame_setup.mojom',
-
- # NOTE: Sources duplicated in
- # //content/public/common/BUILD.gn:mojo_bindings.
- 'public/common/mojo_geoposition.mojom',
- ],
- 'includes': [ '../mojo/public/tools/bindings/mojom_bindings_generator.gypi' ],
- 'export_dependent_settings': [
- '../mojo/mojo_base.gyp:mojo_environment_chromium',
- '../mojo/public/mojo_public.gyp:mojo_application_bindings',
- '../mojo/public/mojo_public.gyp:mojo_cpp_bindings',
- ],
+ ]
},
- ],
+ ]
}
« no previous file with comments | « content/content_common.gypi ('k') | content/content_gpu.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698