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

Side by Side Diff: mojo/services/native_viewport/BUILD.gn

Issue 666813002: GN: Fix Android component build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn-clank
Patch Set: Actually undo gyp change Created 6 years, 2 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 unified diff | Download patch
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/ui.gni") 5 import("//build/config/ui.gni")
6 6
7 if (!is_android) { 7 if (!is_android) {
8 shared_library("native_viewport") { 8 shared_library("native_viewport") {
9 output_name = "mojo_native_viewport_service" 9 output_name = "mojo_native_viewport_service"
10 10
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 "platform_viewport_android.cc", 56 "platform_viewport_android.cc",
57 "platform_viewport_android.h", 57 "platform_viewport_android.h",
58 "platform_viewport_mac.mm", 58 "platform_viewport_mac.mm",
59 "platform_viewport_headless.cc", 59 "platform_viewport_headless.cc",
60 "platform_viewport_headless.h", 60 "platform_viewport_headless.h",
61 "platform_viewport_win.cc", 61 "platform_viewport_win.cc",
62 "viewport_surface.cc", 62 "viewport_surface.cc",
63 "viewport_surface.h", 63 "viewport_surface.h",
64 ] 64 ]
65 65
66 libs = []
jamesr 2014/10/22 00:28:19 nit: you don't need this, although it'll be nice i
cjhopman 2014/10/23 00:15:48 With this change (and previous ones), it's easier
67
66 if (is_ios) { 68 if (is_ios) {
67 sources += [ "platform_viewport_stub.cc" ] 69 sources += [ "platform_viewport_stub.cc" ]
68 } 70 }
69 71
70 if (is_android) { 72 if (is_android) {
71 deps += [ "//mojo:jni_headers" ] 73 deps += [ "//mojo:jni_headers" ]
74 libs += [ "android" ]
72 } 75 }
73 76
74 if (use_x11) { 77 if (use_x11) {
75 sources += [ "platform_viewport_x11.cc" ] 78 sources += [ "platform_viewport_x11.cc" ]
76 deps += [ 79 deps += [
77 "//ui/events/platform/x11", 80 "//ui/events/platform/x11",
78 "//ui/platform_window/x11", 81 "//ui/platform_window/x11",
79 ] 82 ]
80 } 83 }
81 84
82 if (use_ozone) { 85 if (use_ozone) {
83 sources += [ "platform_viewport_ozone.cc" ] 86 sources += [ "platform_viewport_ozone.cc" ]
84 } 87 }
85 } 88 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698