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

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

Issue 1321383002: Revert of Android WebVR implementation, Cardboard 0.5.5 SDK (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 54
55 srcjar_deps = [ 55 srcjar_deps = [
56 ":common_aidl", 56 ":common_aidl",
57 ":content_public_android_java_enums_srcjar", 57 ":content_public_android_java_enums_srcjar",
58 "//content/browser/accessibility:content_browser_accessibility_java_enums_sr cjar", 58 "//content/browser/accessibility:content_browser_accessibility_java_enums_sr cjar",
59 "//ui/touch_selection:ui_touch_selection_enums_srcjar", 59 "//ui/touch_selection:ui_touch_selection_enums_srcjar",
60 "//ui/touch_selection:ui_touch_handle_orientation_srcjar", 60 "//ui/touch_selection:ui_touch_handle_orientation_srcjar",
61 ] 61 ]
62 62
63 DEPRECATED_java_in_dir = "java/src" 63 DEPRECATED_java_in_dir = "java/src"
64
65 if (enable_webvr) {
66 deps += [ "//third_party/cardboard-java:cardboard-java" ]
67 }
68 } 64 }
69 65
70 java_strings_grd("content_strings_grd") { 66 java_strings_grd("content_strings_grd") {
71 grd_file = "java/strings/android_content_strings.grd" 67 grd_file = "java/strings/android_content_strings.grd"
72 outputs = [ 68 outputs = [
73 "values-am/android_content_strings.xml", 69 "values-am/android_content_strings.xml",
74 "values-ar/android_content_strings.xml", 70 "values-ar/android_content_strings.xml",
75 "values-bg/android_content_strings.xml", 71 "values-bg/android_content_strings.xml",
76 "values-ca/android_content_strings.xml", 72 "values-ca/android_content_strings.xml",
77 "values-cs/android_content_strings.xml", 73 "values-cs/android_content_strings.xml",
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 jni_package = "content" 148 jni_package = "content"
153 classes = [ 149 classes = [
154 "java/util/HashSet.class", 150 "java/util/HashSet.class",
155 "android/view/MotionEvent.class", 151 "android/view/MotionEvent.class",
156 ] 152 ]
157 } 153 }
158 154
159 generate_jni("content_jni_headers") { 155 generate_jni("content_jni_headers") {
160 sources = rebase_path(content_jni_gypi_values.sources, "", "../..") 156 sources = rebase_path(content_jni_gypi_values.sources, "", "../..")
161 jni_package = "content" 157 jni_package = "content"
162
163 if (enable_webvr) {
164 sources += [ "//content/public/android/java/src/org/chromium/content/browser /input/CardboardVRDevice.java" ]
165 deps = [
166 "//third_party/cardboard-java:cardboard-java",
167 ]
168 }
169 } 158 }
170 159
171 group("jni") { 160 group("jni") {
172 deps = [ 161 deps = [
173 ":content_jni_headers", 162 ":content_jni_headers",
174 ":jar_jni", 163 ":jar_jni",
175 ] 164 ]
176 } 165 }
177 166
178 android_library("content_javatests") { 167 android_library("content_javatests") {
(...skipping 25 matching lines...) Expand all
204 # GYP: //content/content_tests.gypi:content_junit_tests 193 # GYP: //content/content_tests.gypi:content_junit_tests
205 junit_binary("content_junit_tests") { 194 junit_binary("content_junit_tests") {
206 java_files = [ "junit/src/org/chromium/content/browser/input/GamepadMappingsTe st.java" ] 195 java_files = [ "junit/src/org/chromium/content/browser/input/GamepadMappingsTe st.java" ]
207 deps = [ 196 deps = [
208 ":content_java", 197 ":content_java",
209 "//base:base_java", 198 "//base:base_java",
210 "//base:base_java_test_support", 199 "//base:base_java_test_support",
211 ] 200 ]
212 } 201 }
213 # TODO(GYP): content_icudata 202 # TODO(GYP): content_icudata
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698