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

Side by Side Diff: net/android/BUILD.gn

Issue 1829823002: Replace usages of DEPRECATED_java_in_dir with java_files (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: zap random comment Created 4 years, 9 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
« no previous file with comments | « media/midi/BUILD.gn ('k') | printing/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 android_library("net_java") { 8 android_library("net_java") {
9 DEPRECATED_java_in_dir = "java/src" 9 java_files = [
10 "java/src/org/chromium/net/AndroidCertVerifyResult.java",
11 "java/src/org/chromium/net/AndroidKeyStore.java",
12 "java/src/org/chromium/net/AndroidNetworkLibrary.java",
13 "java/src/org/chromium/net/AndroidTrafficStats.java",
14 "java/src/org/chromium/net/GURLUtils.java",
15 "java/src/org/chromium/net/HttpNegotiateAuthenticator.java",
16 "java/src/org/chromium/net/HttpNegotiateConstants.java",
17 "java/src/org/chromium/net/NetStringUtil.java",
18 "java/src/org/chromium/net/NetworkChangeNotifier.java",
19 "java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java",
20 "java/src/org/chromium/net/ProxyChangeListener.java",
21 "java/src/org/chromium/net/RegistrationPolicyAlwaysRegister.java",
22 "java/src/org/chromium/net/RegistrationPolicyApplicationStatus.java",
23 "java/src/org/chromium/net/X509Util.java",
24 ]
10 deps = [ 25 deps = [
11 "//base:base_java", 26 "//base:base_java",
12 ] 27 ]
13 srcjar_deps = [ 28 srcjar_deps = [
14 ":net_errors_java", 29 ":net_errors_java",
15 ":net_android_java_enums_srcjar", 30 ":net_android_java_enums_srcjar",
16 ] 31 ]
17 } 32 }
18 33
19 android_aidl("embedded_test_server_aidl") { 34 android_aidl("embedded_test_server_aidl") {
20 interface_file = "../test/android/javatests/src/org/chromium/net/test/IEmbedde dTestServerInterface.aidl" 35 interface_file = "../test/android/javatests/src/org/chromium/net/test/IEmbedde dTestServerInterface.aidl"
21 sources = [ 36 sources = [
22 "../test/android/javatests/src/org/chromium/net/test/IEmbeddedTestServerImpl .aidl", 37 "../test/android/javatests/src/org/chromium/net/test/IEmbeddedTestServerImpl .aidl",
23 ] 38 ]
24 } 39 }
25 40
26 android_library("net_java_test_support") { 41 android_library("net_java_test_support") {
27 testonly = true 42 testonly = true
28 DEPRECATED_java_in_dir = "../test/android/javatests/src" 43 java_files = [
44 "../test/android/javatests/src/org/chromium/net/test/BaseHttpTestServer.java ",
45 "../test/android/javatests/src/org/chromium/net/test/BaseTcpTestServer.java" ,
46 "../test/android/javatests/src/org/chromium/net/test/BaseTestServer.java",
47 "../test/android/javatests/src/org/chromium/net/test/DummySpnegoAuthenticato r.java",
48 "../test/android/javatests/src/org/chromium/net/test/DummySpnegoAuthenticato rService.java",
49 "../test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java ",
50 "../test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerImpl. java",
51 "../test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerServi ce.java",
52 "../test/android/javatests/src/org/chromium/net/test/TestServerBuilder.java" ,
53 "../test/android/javatests/src/org/chromium/net/test/TestServerSpawner.java" ,
54 "../test/android/javatests/src/org/chromium/net/test/util/CertTestUtil.java" ,
55 "../test/android/javatests/src/org/chromium/net/test/util/NetworkChangeNotif ierTestUtil.java",
56 "../test/android/javatests/src/org/chromium/net/test/util/TestWebServer.java ",
57 ]
29 deps = [ 58 deps = [
30 ":net_java", 59 ":net_java",
31 "//base:base_java", 60 "//base:base_java",
32 "//base:base_java_test_support", 61 "//base:base_java_test_support",
33 "//third_party/android_tools:legacy_http_javalib", 62 "//third_party/android_tools:legacy_http_javalib",
34 ] 63 ]
35 srcjar_deps = [ 64 srcjar_deps = [
36 ":embedded_test_server_aidl", 65 ":embedded_test_server_aidl",
37 ":net_java_test_support_enums_srcjar", 66 ":net_java_test_support_enums_srcjar",
38 ] 67 ]
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 native_libs = [ "libnet_java_test_native_support.so" ] 105 native_libs = [ "libnet_java_test_native_support.so" ]
77 } 106 }
78 107
79 android_resources("net_unittests_apk_resources") { 108 android_resources("net_unittests_apk_resources") {
80 resource_dirs = [ "unittest_support/res" ] 109 resource_dirs = [ "unittest_support/res" ]
81 custom_package = "org.chromium.native_test" 110 custom_package = "org.chromium.native_test"
82 } 111 }
83 112
84 android_library("net_javatests") { 113 android_library("net_javatests") {
85 testonly = true 114 testonly = true
86 DEPRECATED_java_in_dir = "javatests/src" 115 java_files = [
116 "javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java",
117 "javatests/src/org/chromium/net/AndroidProxySelectorTest.java",
118 "javatests/src/org/chromium/net/NetErrorsTest.java",
119 "javatests/src/org/chromium/net/NetworkChangeNotifierTest.java",
120 "javatests/src/org/chromium/net/X509UtilTest.java",
121 ]
87 deps = [ 122 deps = [
88 ":net_java", 123 ":net_java",
89 ":net_java_test_support", 124 ":net_java_test_support",
90 "//base:base_java", 125 "//base:base_java",
91 "//base:base_java_test_support", 126 "//base:base_java_test_support",
92 ] 127 ]
93 } 128 }
94 129
95 java_cpp_template("net_errors_java") { 130 java_cpp_template("net_errors_java") {
96 package_name = "org/chromium/net" 131 package_name = "org/chromium/net"
(...skipping 26 matching lines...) Expand all
123 java_files = 158 java_files =
124 [ "junit/src/org/chromium/net/HttpNegotiateAuthenticatorTest.java" ] 159 [ "junit/src/org/chromium/net/HttpNegotiateAuthenticatorTest.java" ]
125 deps = [ 160 deps = [
126 ":net_java", 161 ":net_java",
127 "//base:base_java", 162 "//base:base_java",
128 "//base:base_java_test_support", 163 "//base:base_java_test_support",
129 "//base:base_junit_test_support", 164 "//base:base_junit_test_support",
130 "//third_party/junit:hamcrest", 165 "//third_party/junit:hamcrest",
131 ] 166 ]
132 } 167 }
OLDNEW
« no previous file with comments | « media/midi/BUILD.gn ('k') | printing/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698