| 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 android_library("net_java") { | 8 android_library("net_java") { |
| 9 java_files = [ | 9 java_files = [ |
| 10 "java/src/org/chromium/net/AndroidCellularSignalStrength.java", | 10 "java/src/org/chromium/net/AndroidCellularSignalStrength.java", |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 shared_library("net_java_test_native_support") { | 87 shared_library("net_java_test_native_support") { |
| 88 testonly = true | 88 testonly = true |
| 89 deps = [ | 89 deps = [ |
| 90 ":java_test_native_support", | 90 ":java_test_native_support", |
| 91 "//net:test_support", | 91 "//net:test_support", |
| 92 ] | 92 ] |
| 93 } | 93 } |
| 94 | 94 |
| 95 android_apk("net_test_support_apk") { | 95 android_apk("net_test_support_apk") { |
| 96 testonly = true | 96 testonly = true |
| 97 |
| 98 # Used as an additional_apk in test scripts. |
| 99 never_incremental = true |
| 97 deps = [ | 100 deps = [ |
| 98 ":net_java_test_support", | 101 ":net_java_test_support", |
| 99 "//base:base_java", | 102 "//base:base_java", |
| 100 ] | 103 ] |
| 101 android_manifest = "../test/android/javatests/AndroidManifest.xml" | 104 android_manifest = "../test/android/javatests/AndroidManifest.xml" |
| 102 apk_name = "ChromiumNetTestSupport" | 105 apk_name = "ChromiumNetTestSupport" |
| 103 shared_libraries = [ ":net_java_test_native_support" ] | 106 shared_libraries = [ ":net_java_test_native_support" ] |
| 104 } | 107 } |
| 105 | 108 |
| 106 android_resources("net_unittests_apk_resources") { | 109 android_resources("net_unittests_apk_resources") { |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 156 java_files = | 159 java_files = |
| 157 [ "junit/src/org/chromium/net/HttpNegotiateAuthenticatorTest.java" ] | 160 [ "junit/src/org/chromium/net/HttpNegotiateAuthenticatorTest.java" ] |
| 158 deps = [ | 161 deps = [ |
| 159 ":net_java", | 162 ":net_java", |
| 160 "//base:base_java", | 163 "//base:base_java", |
| 161 "//base:base_java_test_support", | 164 "//base:base_java_test_support", |
| 162 "//third_party/hamcrest:hamcrest_java", | 165 "//third_party/hamcrest:hamcrest_java", |
| 163 ] | 166 ] |
| 164 srcjar_deps = [ "//base:base_build_config_gen" ] | 167 srcjar_deps = [ "//base:base_build_config_gen" ] |
| 165 } | 168 } |
| OLD | NEW |