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

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

Issue 1029753002: Plumbs through android supplying multipe touch points (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: cleanup Created 5 years, 9 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",
17 ] 16 ]
18 } 17 }
19 18
20 android_library("native_viewport_java") { 19 android_library("native_viewport_java") {
21 java_files = 20 java_files =
22 [ "android/src/org/chromium/mojo/PlatformViewportAndroid.java" ] 21 [ "android/src/org/chromium/mojo/PlatformViewportAndroid.java" ]
23 22
24 deps = [ 23 deps = [
25 "//base:base_java", 24 "//base:base_java",
26 ] 25 ]
27 } 26 }
28 27
28 generate_jar_jni("motionevent_jni_headers") {
29 classes = [ "android/view/MotionEvent.class" ]
30
31 jni_package = "mojo"
32 }
33
29 generate_jni("jni_headers") { 34 generate_jni("jni_headers") {
30 sources = [ 35 sources = [
31 "android/src/org/chromium/mojo/PlatformViewportAndroid.java", 36 "android/src/org/chromium/mojo/PlatformViewportAndroid.java",
32 ] 37 ]
33 38
34 jni_package = "mojo" 39 jni_package = "mojo"
35 } 40 }
36 } else { 41 } else {
37 mojo_native_application("native_viewport") { 42 mojo_native_application("native_viewport") {
38 output_name = "native_viewport_service" 43 output_name = "native_viewport_service"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 "//mojo/services/native_viewport/public/interfaces", 91 "//mojo/services/native_viewport/public/interfaces",
87 "//ui/events", 92 "//ui/events",
88 "//ui/events/platform", 93 "//ui/events/platform",
89 "//ui/gfx", 94 "//ui/gfx",
90 "//ui/gfx/geometry", 95 "//ui/gfx/geometry",
91 "//ui/gl", 96 "//ui/gl",
92 "//ui/platform_window", 97 "//ui/platform_window",
93 ] 98 ]
94 99
95 if (is_android) { 100 if (is_android) {
96 deps += [ ":jni_headers" ] 101 deps += [
102 ":jni_headers",
103 ":motionevent_jni_headers",
104 ]
97 } 105 }
98 106
99 if (use_x11) { 107 if (use_x11) {
100 deps += [ "//ui/platform_window/x11" ] 108 deps += [ "//ui/platform_window/x11" ]
101 } else { 109 } else {
102 sources -= [ "platform_viewport_x11.cc" ] 110 sources -= [ "platform_viewport_x11.cc" ]
103 } 111 }
104 112
105 if (is_win) { 113 if (is_win) {
106 deps += [ "//ui/platform_window/win" ] 114 deps += [ "//ui/platform_window/win" ]
107 } 115 }
108 } 116 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698