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

Unified Diff: chrome/chrome_common.gypi

Issue 2014013002: Add SkBitmap StructTraits for skia::mojo::Bitmap. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and rebase. Created 4 years, 7 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 | « chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.cc ('k') | chrome/utility/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_common.gypi
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 7aea68295b2b77c2e3f60da488d9399e302032da..ae24e7ac0de0dd6e3a652392ab7a8a70da8c167e 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -650,19 +650,34 @@
'includes': [ '../build/protoc.gypi' ],
},
{
+ 'target_name': 'common_mojo_bindings_mojom',
+ 'type': 'none',
+ 'variables': {
+ 'mojom_files': [
+ 'common/image_decoder.mojom',
+ 'common/resource_usage_reporter.mojom',
+ ],
+ 'mojom_typemaps': [
+ '../skia/public/interfaces/skbitmap.typemap',
+ ],
+ },
+ 'dependencies': [
+ '../mojo/mojo_public.gyp:mojo_cpp_bindings',
+ '../skia/skia.gyp:skia_mojo',
+ ],
+ 'includes': [ '../mojo/mojom_bindings_generator_explicit.gypi' ],
+ },
+ {
# GN version: //chrome/common:mojo_bindings
'target_name': 'common_mojo_bindings',
'type': 'static_library',
- 'includes': [
- '../mojo/mojom_bindings_generator.gypi'
- ],
- 'sources': [
- 'common/image_decoder.mojom',
- 'common/resource_usage_reporter.mojom',
- ],
'dependencies': [
+ 'common_mojo_bindings_mojom',
'../mojo/mojo_public.gyp:mojo_cpp_bindings',
- '../skia/skia.gyp:skia_mojo',
+ '../skia/skia.gyp:skia',
+ ],
+ 'export_dependent_settings': [
+ '../skia/skia.gyp:skia',
],
},
],
« no previous file with comments | « chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.cc ('k') | chrome/utility/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698