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

Unified Diff: mojo/mojo.gyp

Issue 477923004: Create native_viewport_service, don't build it into mojo_shell unless Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Get the static build to work Created 6 years, 4 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 | « no previous file | mojo/mojo_services.gypi » ('j') | mojo/services/native_viewport/main.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/mojo.gyp
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index 69678c5772f6c9286789c87c65fba3438ab8343c..abe00f4ce9775140bf8a982ce9b2250bc2e6cf4f 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -38,7 +38,7 @@
'mojo_html_viewer',
'mojo_js',
'mojo_launcher',
- 'mojo_native_viewport_service_lib',
+ 'mojo_native_viewport_service',
'mojo_network_service',
'mojo_pepper_container_app',
'mojo_png_viewer',
@@ -145,7 +145,6 @@
'mojo_base.gyp:mojo_system_impl',
'mojo_base.gyp:mojo_application_chromium',
'mojo_external_service_bindings',
- 'mojo_native_viewport_service_lib',
'mojo_network_bindings',
'mojo_spy',
],
@@ -200,6 +199,7 @@
['OS=="android"', {
'dependencies': [
'mojo_network_service_lib',
+ 'mojo_native_viewport_service_lib',
],
'sources': [
'shell/network_application_loader.cc',
« no previous file with comments | « no previous file | mojo/mojo_services.gypi » ('j') | mojo/services/native_viewport/main.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698