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

Side by Side Diff: content/public/android/BUILD.gn

Issue 1198513003: Revert "Adding Chrome-side WebVR interface and Cardboard implementation" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 6 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/android/config.gni") 5 import("//build/config/android/config.gni")
6 import("//build/config/android/rules.gni") 6 import("//build/config/android/rules.gni")
7 7
8 content_jni_gypi_values = exec_script("//build/gypi_to_gn.py", 8 content_jni_gypi_values = exec_script("//build/gypi_to_gn.py",
9 [ rebase_path("../../content_jni.gypi") ], 9 [ rebase_path("../../content_jni.gypi") ],
10 "scope", 10 "scope",
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 ] 50 ]
51 51
52 srcjar_deps = [ 52 srcjar_deps = [
53 ":common_aidl", 53 ":common_aidl",
54 ":content_public_android_java_enums_srcjar", 54 ":content_public_android_java_enums_srcjar",
55 "//ui/touch_selection:ui_touch_selection_enums_srcjar", 55 "//ui/touch_selection:ui_touch_selection_enums_srcjar",
56 "//ui/touch_selection:ui_touch_handle_orientation_srcjar", 56 "//ui/touch_selection:ui_touch_handle_orientation_srcjar",
57 ] 57 ]
58 58
59 DEPRECATED_java_in_dir = "java/src" 59 DEPRECATED_java_in_dir = "java/src"
60
61 if (enable_webvr) {
62 deps += [ "//third_party/cardboard-java:cardboard-java" ]
63 }
64 } 60 }
65 61
66 java_strings_grd("content_strings_grd") { 62 java_strings_grd("content_strings_grd") {
67 grd_file = "java/strings/android_content_strings.grd" 63 grd_file = "java/strings/android_content_strings.grd"
68 outputs = [ 64 outputs = [
69 "values-am/android_content_strings.xml", 65 "values-am/android_content_strings.xml",
70 "values-ar/android_content_strings.xml", 66 "values-ar/android_content_strings.xml",
71 "values-bg/android_content_strings.xml", 67 "values-bg/android_content_strings.xml",
72 "values-ca/android_content_strings.xml", 68 "values-ca/android_content_strings.xml",
73 "values-cs/android_content_strings.xml", 69 "values-cs/android_content_strings.xml",
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 jni_package = "content" 144 jni_package = "content"
149 classes = [ 145 classes = [
150 "java/util/HashSet.class", 146 "java/util/HashSet.class",
151 "android/view/MotionEvent.class", 147 "android/view/MotionEvent.class",
152 ] 148 ]
153 } 149 }
154 150
155 generate_jni("content_jni_headers") { 151 generate_jni("content_jni_headers") {
156 sources = rebase_path(content_jni_gypi_values.sources, "", "../..") 152 sources = rebase_path(content_jni_gypi_values.sources, "", "../..")
157 jni_package = "content" 153 jni_package = "content"
158
159 if (enable_webvr) {
160 sources += [ "//content/public/android/java/src/org/chromium/content/browser /input/CardboardVRDevice.java" ]
161 deps = [
162 "//third_party/cardboard-java:cardboard-java",
163 ]
164 }
165 } 154 }
166 155
167 group("jni") { 156 group("jni") {
168 deps = [ 157 deps = [
169 ":content_jni_headers", 158 ":content_jni_headers",
170 ":jar_jni", 159 ":jar_jni",
171 ] 160 ]
172 } 161 }
173 162
174 android_library("content_javatests") { 163 android_library("content_javatests") {
(...skipping 24 matching lines...) Expand all
199 # GYP: //content/content_tests.gypi:content_junit_tests 188 # GYP: //content/content_tests.gypi:content_junit_tests
200 junit_binary("content_junit_tests") { 189 junit_binary("content_junit_tests") {
201 java_files = [ "junit/src/org/chromium/content/browser/input/GamepadMappingsTe st.java" ] 190 java_files = [ "junit/src/org/chromium/content/browser/input/GamepadMappingsTe st.java" ]
202 deps = [ 191 deps = [
203 ":content_java", 192 ":content_java",
204 "//base:base_java", 193 "//base:base_java",
205 "//base:base_java_test_support", 194 "//base:base_java_test_support",
206 ] 195 ]
207 } 196 }
208 # TODO(GYP): content_icudata 197 # TODO(GYP): content_icudata
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698