Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 178 android_library("content_javatests") { | 178 android_library("content_javatests") { |
| 179 testonly = true | 179 testonly = true |
| 180 deps = [ | 180 deps = [ |
| 181 "//base:base_java", | 181 "//base:base_java", |
| 182 "//base:base_java_test_support", | 182 "//base:base_java_test_support", |
| 183 "//content/public/test/android:content_java_test_support", | 183 "//content/public/test/android:content_java_test_support", |
| 184 "//content/shell/android:content_shell_java", | 184 "//content/shell/android:content_shell_java", |
| 185 "//content/shell/android:content_shell_java_resources", | 185 "//content/shell/android:content_shell_java_resources", |
| 186 "//content/shell/android:content_shell_apk_java", | 186 "//content/shell/android:content_shell_apk_java", |
| 187 "//content/shell/android:content_shell_test_java", | 187 "//content/shell/android:content_shell_test_java", |
| 188 "//device/vibration/android:vibration_manager_android", | |
|
timvolodine
2015/10/20 13:16:22
no similar gyp changes?
leonhsl(Using Gerrit)
2015/10/22 10:47:57
Yeah gyp has no need to do so.
gyp has no "content
| |
| 189 "//device/vibration:mojo_bindings_java", | |
| 188 "//media/base/android:media_java", | 190 "//media/base/android:media_java", |
| 189 "//mojo/android:system_java", | 191 "//mojo/android:system_java", |
| 190 "//net/android:net_java", | 192 "//net/android:net_java", |
| 191 "//net/android:net_java_test_support", | 193 "//net/android:net_java_test_support", |
| 192 "//third_party/android_tools:android_support_v13_java", | 194 "//third_party/android_tools:android_support_v13_java", |
| 193 "//third_party/android_tools:legacy_http_javalib", | 195 "//third_party/android_tools:legacy_http_javalib", |
| 194 "//third_party/mojo/src/mojo/public/interfaces/bindings/tests:test_interface s_java", | 196 "//third_party/mojo/src/mojo/public/interfaces/bindings/tests:test_interface s_java", |
| 195 "//third_party/mojo/src/mojo/public/java:bindings", | 197 "//third_party/mojo/src/mojo/public/java:bindings", |
| 196 "//third_party/mojo/src/mojo/public/java:system", | 198 "//third_party/mojo/src/mojo/public/java:system", |
| 197 "//ui/android:ui_java", | 199 "//ui/android:ui_java", |
| 198 ":content_java", | 200 ":content_java", |
| 199 ] | 201 ] |
| 200 | 202 |
| 201 DEPRECATED_java_in_dir = "javatests/src" | 203 DEPRECATED_java_in_dir = "javatests/src" |
| 202 } | 204 } |
| 203 | 205 |
| 204 # GYP: //content/content_tests.gypi:content_junit_tests | 206 # GYP: //content/content_tests.gypi:content_junit_tests |
| 205 junit_binary("content_junit_tests") { | 207 junit_binary("content_junit_tests") { |
| 206 java_files = [ "junit/src/org/chromium/content/browser/input/GamepadMappingsTe st.java" ] | 208 java_files = [ "junit/src/org/chromium/content/browser/input/GamepadMappingsTe st.java" ] |
| 207 deps = [ | 209 deps = [ |
| 208 ":content_java", | 210 ":content_java", |
| 209 "//base:base_java", | 211 "//base:base_java", |
| 210 "//base:base_java_test_support", | 212 "//base:base_java_test_support", |
| 211 ] | 213 ] |
| 212 } | 214 } |
| 213 # TODO(GYP): content_icudata | 215 # TODO(GYP): content_icudata |
| OLD | NEW |