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

Side by Side Diff: components/cronet/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 | « components/bookmarks/common/android/BUILD.gn ('k') | components/gcm_driver/android/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 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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/buildflag_header.gni") 5 import("//build/buildflag_header.gni")
6 import("//build/config/android/config.gni") 6 import("//build/config/android/config.gni")
7 import("//build/config/android/rules.gni") 7 import("//build/config/android/rules.gni")
8 import("//build/util/version.gni") 8 import("//build/util/version.gni")
9 import("//chrome/version.gni") 9 import("//chrome/version.gni")
10 import("//testing/test.gni") 10 import("//testing/test.gni")
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 238
239 # Avoid hide_native_jni_exports as it adds another version script, and the 239 # Avoid hide_native_jni_exports as it adds another version script, and the
240 # ARM64 linker throws an error for multiple version scripts with anonymous 240 # ARM64 linker throws an error for multiple version scripts with anonymous
241 # version tags. 241 # version tags.
242 configs -= [ "//build/config/android:hide_native_jni_exports" ] 242 configs -= [ "//build/config/android:hide_native_jni_exports" ]
243 } 243 }
244 244
245 # cronet_api.jar defines Cronet API and provides implementation of 245 # cronet_api.jar defines Cronet API and provides implementation of
246 # legacy api using HttpUrlConnection (not the Chromium stack). 246 # legacy api using HttpUrlConnection (not the Chromium stack).
247 android_library("cronet_api") { 247 android_library("cronet_api") {
248 DEPRECATED_java_in_dir = "api/src" 248 java_files = [
249 "api/src/org/chromium/net/BidirectionalStream.java",
250 "api/src/org/chromium/net/ChunkedWritableByteChannel.java",
251 "api/src/org/chromium/net/CronetEngine.java",
252 "api/src/org/chromium/net/CronetException.java",
253 "api/src/org/chromium/net/HttpUrlConnectionUrlRequest.java",
254 "api/src/org/chromium/net/HttpUrlConnectionUrlRequestFactory.java",
255 "api/src/org/chromium/net/HttpUrlRequest.java",
256 "api/src/org/chromium/net/HttpUrlRequestFactory.java",
257 "api/src/org/chromium/net/HttpUrlRequestFactoryConfig.java",
258 "api/src/org/chromium/net/HttpUrlRequestListener.java",
259 "api/src/org/chromium/net/InputStreamChannel.java",
260 "api/src/org/chromium/net/JavaCronetEngine.java",
261 "api/src/org/chromium/net/JavaUrlRequest.java",
262 "api/src/org/chromium/net/NetworkQualityRttListener.java",
263 "api/src/org/chromium/net/NetworkQualityThroughputListener.java",
264 "api/src/org/chromium/net/Preconditions.java",
265 "api/src/org/chromium/net/ResponseTooLargeException.java",
266 "api/src/org/chromium/net/UploadDataProvider.java",
267 "api/src/org/chromium/net/UploadDataProviders.java",
268 "api/src/org/chromium/net/UploadDataSink.java",
269 "api/src/org/chromium/net/UrlRequest.java",
270 "api/src/org/chromium/net/UrlRequestContextConfig.java",
271 "api/src/org/chromium/net/UrlRequestException.java",
272 "api/src/org/chromium/net/UrlResponseInfo.java",
273 "api/src/org/chromium/net/UserAgent.java",
274 ]
249 275
250 deps = [ 276 deps = [
251 "//third_party/android_tools:android_support_annotations_javalib", 277 "//third_party/android_tools:android_support_annotations_javalib",
252 ] 278 ]
253 279
254 srcjar_deps = [ 280 srcjar_deps = [
255 ":cronet_version_srcjar", 281 ":cronet_version_srcjar",
256 ":http_cache_type_java", 282 ":http_cache_type_java",
257 ":url_request_error_java", 283 ":url_request_error_java",
258 ":load_states_list", 284 ":load_states_list",
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 324
299 run_findbugs = true 325 run_findbugs = true
300 } 326 }
301 327
302 android_resources("cronet_sample_apk_resources") { 328 android_resources("cronet_sample_apk_resources") {
303 resource_dirs = [ "sample/res" ] 329 resource_dirs = [ "sample/res" ]
304 android_manifest = "sample/AndroidManifest.xml" 330 android_manifest = "sample/AndroidManifest.xml"
305 } 331 }
306 332
307 android_library("cronet_sample_apk_java") { 333 android_library("cronet_sample_apk_java") {
308 DEPRECATED_java_in_dir = "sample/src" 334 java_files = [
335 "sample/src/org/chromium/cronet_sample_apk/CronetSampleActivity.java",
336 "sample/src/org/chromium/cronet_sample_apk/CronetSampleApplication.java",
337 ]
309 338
310 deps = [ 339 deps = [
311 ":cronet_api", 340 ":cronet_api",
312 ":cronet_java", 341 ":cronet_java",
313 ":cronet_sample_apk_resources", 342 ":cronet_sample_apk_resources",
314 "//base:base_java", 343 "//base:base_java",
315 ] 344 ]
316 345
317 run_findbugs = true 346 run_findbugs = true
318 } 347 }
(...skipping 27 matching lines...) Expand all
346 # "tested apk" are removed from the "instrumentation test apk". 375 # "tested apk" are removed from the "instrumentation test apk".
347 android_resources("cronet_sample_test_apk_resources") { 376 android_resources("cronet_sample_test_apk_resources") {
348 resource_dirs = [ "sample/res" ] 377 resource_dirs = [ "sample/res" ]
349 android_manifest = "sample/AndroidManifest.xml" 378 android_manifest = "sample/AndroidManifest.xml"
350 } 379 }
351 380
352 instrumentation_test_apk("cronet_sample_test_apk") { 381 instrumentation_test_apk("cronet_sample_test_apk") {
353 apk_name = "CronetSampleTest" 382 apk_name = "CronetSampleTest"
354 apk_under_test = ":cronet_sample_apk" 383 apk_under_test = ":cronet_sample_apk"
355 android_manifest = "sample/javatests/AndroidManifest.xml" 384 android_manifest = "sample/javatests/AndroidManifest.xml"
356 DEPRECATED_java_in_dir = "sample/javatests/src" 385 java_files = [
386 "sample/javatests/src/org/chromium/cronet_sample_apk/Criteria.java",
387 "sample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleTest.java",
388 ]
357 389
358 deps = [ 390 deps = [
359 ":cronet_api", 391 ":cronet_api",
360 ":cronet_java", 392 ":cronet_java",
361 ":cronet_sample_apk_java", 393 ":cronet_sample_apk_java",
362 ":cronet_sample_test_apk_resources", 394 ":cronet_sample_test_apk_resources",
363 "//base:base_java", 395 "//base:base_java",
364 "//base:base_java_test_support", 396 "//base:base_java_test_support",
365 ] 397 ]
366 additional_apks = [ "//net/android:net_test_support_apk" ] 398 additional_apks = [ "//net/android:net_test_support_apk" ]
(...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after
834 ":cronet_package_copy_native_lib", 866 ":cronet_package_copy_native_lib",
835 ":cronet_package_copy_native_lib_unstripped", 867 ":cronet_package_copy_native_lib_unstripped",
836 ":generate_javadoc", 868 ":generate_javadoc",
837 ":generate_licenses", 869 ":generate_licenses",
838 ":jar_cronet_api_source", 870 ":jar_cronet_api_source",
839 ":jar_cronet_other_source", 871 ":jar_cronet_other_source",
840 ":jar_cronet_sample_source", 872 ":jar_cronet_sample_source",
841 ":repackage_extracted_jars", 873 ":repackage_extracted_jars",
842 ] 874 ]
843 } 875 }
OLDNEW
« no previous file with comments | « components/bookmarks/common/android/BUILD.gn ('k') | components/gcm_driver/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698