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

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

Issue 1280613003: Allow native_viewport to create new native windows on demand on Android. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 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 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 import("//mojo/public/mojo_application.gni") 6 import("//mojo/public/mojo_application.gni")
7 7
8 if (is_android) { 8 if (is_android) {
9 import("//build/config/android/config.gni") 9 import("//build/config/android/config.gni")
10 import("//build/config/android/rules.gni") 10 import("//build/config/android/rules.gni")
11 11
12 group("native_viewport") { 12 group("native_viewport") {
13 deps = [ 13 deps = [
14 ":lib", 14 ":lib",
15 ":native_viewport_java", 15 ":native_viewport_java",
16 ":jni_headers", 16 ":jni_headers",
17 ] 17 ]
18 } 18 }
19 19
20 android_library("native_viewport_java") { 20 android_library("native_viewport_java") {
21 java_files = 21 java_files =
22 [ "android/src/org/chromium/mojo/PlatformViewportAndroid.java" ] 22 [ "android/src/org/chromium/mojo/PlatformViewportAndroid.java" ]
23 23
24 deps = [ 24 deps = [
25 "//base:base_java", 25 "//base:base_java",
26 "//services/keyboard", 26 "//services/keyboard",
27 "//mojo/services/keyboard/public/interfaces:interfaces_java", 27 "//mojo/services/keyboard/public/interfaces:interfaces_java",
28 "//mojo/public/java:bindings", 28 "//mojo/public/java:bindings",
29 "//mojo/public/java:system", 29 "//mojo/public/java:system",
30 "//shell:java",
qsr 2015/08/06 14:13:20 As discussed offline, this layering violation is a
etiennej 2015/08/07 10:16:37 Done.
30 ] 31 ]
31 } 32 }
32 33
33 generate_jni("jni_headers") { 34 generate_jni("jni_headers") {
34 sources = [ 35 sources = [
35 "android/src/org/chromium/mojo/PlatformViewportAndroid.java", 36 "android/src/org/chromium/mojo/PlatformViewportAndroid.java",
36 ] 37 ]
37 38
38 jni_package = "mojo" 39 jni_package = "mojo"
39 } 40 }
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 if (use_x11) { 107 if (use_x11) {
107 deps += [ "//ui/platform_window/x11" ] 108 deps += [ "//ui/platform_window/x11" ]
108 } else { 109 } else {
109 sources -= [ "platform_viewport_x11.cc" ] 110 sources -= [ "platform_viewport_x11.cc" ]
110 } 111 }
111 112
112 if (is_win) { 113 if (is_win) {
113 deps += [ "//ui/platform_window/win" ] 114 deps += [ "//ui/platform_window/win" ]
114 } 115 }
115 } 116 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698