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

Unified Diff: mojo/mojo_services.gypi

Issue 93793009: Implement ServiceManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Allow Android to be built Created 7 years 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 | « mojo/mojo_examples.gypi ('k') | mojo/services/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/mojo_services.gypi
diff --git a/mojo/mojo_services.gypi b/mojo/mojo_services.gypi
index 983d69f1ec447ec957719715b274432be03dd0f3..cf51ac358289ea347141d14bbd8f6a2e7d10c10a 100644
--- a/mojo/mojo_services.gypi
+++ b/mojo/mojo_services.gypi
@@ -45,23 +45,25 @@
},
{
'target_name': 'mojo_native_viewport_service',
- 'type': 'static_library',
+ 'type': 'shared_library',
'dependencies': [
'../base/base.gyp:base',
'../ui/events/events.gyp:events',
'../ui/gfx/gfx.gyp:gfx',
+ 'mojo_common_lib',
'mojo_gles2_service',
'mojo_native_viewport_bindings',
+ 'mojo_shell_bindings',
],
- 'export_dependent_settings': [
- 'mojo_native_viewport_bindings',
+ 'defines': [
+ 'MOJO_NATIVE_VIEWPORT_IMPLEMENTATION',
],
'sources': [
'services/native_viewport/native_viewport.h',
'services/native_viewport/native_viewport_android.cc',
- 'services/native_viewport/native_viewport_impl.cc',
- 'services/native_viewport/native_viewport_impl.h',
'services/native_viewport/native_viewport_mac.mm',
+ 'services/native_viewport/native_viewport_service.cc',
+ 'services/native_viewport/native_viewport_service.h',
'services/native_viewport/native_viewport_stub.cc',
'services/native_viewport/native_viewport_win.cc',
'services/native_viewport/native_viewport_x11.cc',
« no previous file with comments | « mojo/mojo_examples.gypi ('k') | mojo/services/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698