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

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

Issue 1274913004: 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, 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/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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 56
57 srcjar_deps = [ 57 srcjar_deps = [
58 ":common_aidl", 58 ":common_aidl",
59 ":content_public_android_java_enums_srcjar", 59 ":content_public_android_java_enums_srcjar",
60 "//content/browser/accessibility:content_browser_accessibility_java_enums_sr cjar", 60 "//content/browser/accessibility:content_browser_accessibility_java_enums_sr cjar",
61 "//ui/touch_selection:ui_touch_selection_enums_srcjar", 61 "//ui/touch_selection:ui_touch_selection_enums_srcjar",
62 "//ui/touch_selection:ui_touch_handle_orientation_srcjar", 62 "//ui/touch_selection:ui_touch_handle_orientation_srcjar",
63 ] 63 ]
64 64
65 DEPRECATED_java_in_dir = "java/src" 65 DEPRECATED_java_in_dir = "java/src"
66
67 if (enable_webvr) {
68 deps += [ "//third_party/cardboard-java:cardboard-java" ]
69 }
70 } 66 }
71 67
72 java_strings_grd("content_strings_grd") { 68 java_strings_grd("content_strings_grd") {
73 grd_file = "java/strings/android_content_strings.grd" 69 grd_file = "java/strings/android_content_strings.grd"
74 outputs = [ 70 outputs = [
75 "values-am/android_content_strings.xml", 71 "values-am/android_content_strings.xml",
76 "values-ar/android_content_strings.xml", 72 "values-ar/android_content_strings.xml",
77 "values-bg/android_content_strings.xml", 73 "values-bg/android_content_strings.xml",
78 "values-ca/android_content_strings.xml", 74 "values-ca/android_content_strings.xml",
79 "values-cs/android_content_strings.xml", 75 "values-cs/android_content_strings.xml",
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 jni_package = "content" 150 jni_package = "content"
155 classes = [ 151 classes = [
156 "java/util/HashSet.class", 152 "java/util/HashSet.class",
157 "android/view/MotionEvent.class", 153 "android/view/MotionEvent.class",
158 ] 154 ]
159 } 155 }
160 156
161 generate_jni("content_jni_headers") { 157 generate_jni("content_jni_headers") {
162 sources = rebase_path(content_jni_gypi_values.sources, "", "../..") 158 sources = rebase_path(content_jni_gypi_values.sources, "", "../..")
163 jni_package = "content" 159 jni_package = "content"
164
165 if (enable_webvr) {
166 sources += [ "//content/public/android/java/src/org/chromium/content/browser /input/CardboardVRDevice.java" ]
167 deps = [
168 "//third_party/cardboard-java:cardboard-java",
169 ]
170 }
171 } 160 }
172 161
173 group("jni") { 162 group("jni") {
174 deps = [ 163 deps = [
175 ":content_jni_headers", 164 ":content_jni_headers",
176 ":jar_jni", 165 ":jar_jni",
177 ] 166 ]
178 } 167 }
179 168
180 android_library("content_javatests") { 169 android_library("content_javatests") {
(...skipping 24 matching lines...) Expand all
205 # GYP: //content/content_tests.gypi:content_junit_tests 194 # GYP: //content/content_tests.gypi:content_junit_tests
206 junit_binary("content_junit_tests") { 195 junit_binary("content_junit_tests") {
207 java_files = [ "junit/src/org/chromium/content/browser/input/GamepadMappingsTe st.java" ] 196 java_files = [ "junit/src/org/chromium/content/browser/input/GamepadMappingsTe st.java" ]
208 deps = [ 197 deps = [
209 ":content_java", 198 ":content_java",
210 "//base:base_java", 199 "//base:base_java",
211 "//base:base_java_test_support", 200 "//base:base_java_test_support",
212 ] 201 ]
213 } 202 }
214 # TODO(GYP): content_icudata 203 # TODO(GYP): content_icudata
OLDNEW
« no previous file with comments | « content/content_tests.gypi ('k') | content/public/android/java/src/org/chromium/content/browser/input/CardboardVRDevice.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698