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

Unified Diff: mojo/services/native_viewport/BUILD.gn

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: Try to get gn build working again Created 6 years, 3 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
Index: mojo/services/native_viewport/BUILD.gn
diff --git a/mojo/services/native_viewport/BUILD.gn b/mojo/services/native_viewport/BUILD.gn
index 128aef9b834de39d412c4b20fbb7dd9a694bf8bf..25ccfbd967e18d2272f5d3a983c2e71ef829f22b 100644
--- a/mojo/services/native_viewport/BUILD.gn
+++ b/mojo/services/native_viewport/BUILD.gn
@@ -5,9 +5,21 @@
import("//build/config/ui.gni")
import("//mojo/system.gni")
-static_library("native_viewport") {
- output_name = "mojo_native_viewport"
+if (!is_android) {
+ shared_library("native_viewport") {
+ output_name = "mojo_native_viewport_service"
+ deps = [
+ ":lib",
+ "//mojo/services/public/interfaces/native_viewport",
+ ]
+ deps += mojo_system_for_shared_library
+
+ sources = [ "main.cc" ]
+ }
+}
+
+source_set("lib") {
deps = [
"//base",
"//cc/surfaces",
@@ -49,13 +61,6 @@ static_library("native_viewport") {
deps += [ "//mojo:jni_headers" ]
}
- if (is_win) {
- deps += [
- # TODO(GYP)
- # '../ui/platform_window/win/win_window.gyp:win_window',
- ]
- }
-
if (use_x11) {
sources += [ "platform_viewport_x11.cc" ]
deps += [

Powered by Google App Engine
This is Rietveld 408576698