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 DEPRECATED_java_in_dir = "java/src" | 9 DEPRECATED_java_in_dir = "java/src" |
10 deps = [ | 10 deps = [ |
(...skipping 12 matching lines...) Expand all Loading... | |
23 sources = [ | 23 sources = [ |
24 "java/src/org/chromium/net/IRemoteAndroidKeyStore.aidl", | 24 "java/src/org/chromium/net/IRemoteAndroidKeyStore.aidl", |
25 "java/src/org/chromium/net/IRemoteAndroidKeyStoreCallbacks.aidl", | 25 "java/src/org/chromium/net/IRemoteAndroidKeyStoreCallbacks.aidl", |
26 ] | 26 ] |
27 } | 27 } |
28 | 28 |
29 android_library("net_java_test_support") { | 29 android_library("net_java_test_support") { |
30 DEPRECATED_java_in_dir = "../test/android/javatests/src" | 30 DEPRECATED_java_in_dir = "../test/android/javatests/src" |
31 deps = [ | 31 deps = [ |
32 "//base:base_java", | 32 "//base:base_java", |
33 ":net_java", | |
33 ] | 34 ] |
34 srcjar_deps = [ ":net_java_test_support_enums_srcjar" ] | 35 srcjar_deps = [ ":net_java_test_support_enums_srcjar" ] |
35 } | 36 } |
36 | 37 |
37 android_library("net_javatests") { | 38 android_library("net_javatests") { |
38 DEPRECATED_java_in_dir = "javatests/src" | 39 DEPRECATED_java_in_dir = "javatests/src" |
39 deps = [ | 40 deps = [ |
40 "//base:base_java", | 41 "//base:base_java", |
41 "//base:base_java_test_support", | 42 "//base:base_java_test_support", |
42 ":net_java", | 43 ":net_java", |
(...skipping 28 matching lines...) Expand all Loading... | |
71 ] | 72 ] |
72 outputs = [ | 73 outputs = [ |
73 "org/chromium/net/CertificateMimeType.java", | 74 "org/chromium/net/CertificateMimeType.java", |
74 "org/chromium/net/CertVerifyStatusAndroid.java", | 75 "org/chromium/net/CertVerifyStatusAndroid.java", |
75 "org/chromium/net/ConnectionSubtype.java", | 76 "org/chromium/net/ConnectionSubtype.java", |
76 "org/chromium/net/ConnectionType.java", | 77 "org/chromium/net/ConnectionType.java", |
77 "org/chromium/net/PrivateKeyType.java", | 78 "org/chromium/net/PrivateKeyType.java", |
78 ] | 79 ] |
79 } | 80 } |
80 | 81 |
82 # GYP: //net/net.gyp:net_junit_tests | |
cbentzel
2015/06/30 12:53:55
Why is the comment needed?
aberent
2015/07/02 21:13:34
Done.
| |
83 junit_binary("net_junit_tests") { | |
84 java_files = | |
85 [ "junit/src/org/chromium/net/HttpNegotiateAuthenticatorTest.java" ] | |
86 deps = [ | |
87 ":net_java", | |
88 "//base:base_java", | |
89 "//base:base_java_test_support", | |
90 "//third_party/junit:hamcrest", | |
91 ] | |
92 } | |
93 | |
81 # TODO(GYP) | 94 # TODO(GYP) |
82 if (false) { | 95 if (false) { |
83 unittest_apk("net_unittests_apk") { | 96 unittest_apk("net_unittests_apk") { |
84 deps = [ | 97 deps = [ |
85 ":net_java", | 98 ":net_java", |
86 ":net_javatests", | 99 ":net_javatests", |
87 "//net:net_unittests", | 100 "//net:net_unittests", |
88 ] | 101 ] |
89 unittests_dep = "//net:net_unittests" | 102 unittests_dep = "//net:net_unittests" |
90 } | 103 } |
91 } | 104 } |
OLD | NEW |