| OLD | NEW |
| 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/process_version.gni") | 8 import("//build/util/process_version.gni") |
| 9 import("//build/util/version.gni") | 9 import("//build/util/version.gni") |
| 10 import("//testing/test.gni") | 10 import("//testing/test.gni") |
| (...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 257 rebase_path("//components/cronet/android/only_jni_exports.lst") ] | 257 rebase_path("//components/cronet/android/only_jni_exports.lst") ] |
| 258 | 258 |
| 259 # Avoid hide_native_jni_exports as it adds another version script, and the | 259 # Avoid hide_native_jni_exports as it adds another version script, and the |
| 260 # ARM64 linker throws an error for multiple version scripts with anonymous | 260 # ARM64 linker throws an error for multiple version scripts with anonymous |
| 261 # version tags. | 261 # version tags. |
| 262 configs -= [ "//build/config/android:hide_native_jni_exports" ] | 262 configs -= [ "//build/config/android:hide_native_jni_exports" ] |
| 263 } | 263 } |
| 264 | 264 |
| 265 cronet_api_srcjar_deps = [ ":cronet_api_version_srcjar" ] | 265 cronet_api_srcjar_deps = [ ":cronet_api_version_srcjar" ] |
| 266 | 266 |
| 267 # cronet_api.jar defines Cronet API. | 267 # cronet_api_java.jar defines Cronet API. |
| 268 android_library("cronet_api") { | 268 android_library("cronet_api_java") { |
| 269 output_name = "cronet_api" |
| 269 java_files = [ | 270 java_files = [ |
| 270 "api/src/org/chromium/net/BidirectionalStream.java", | 271 "api/src/org/chromium/net/BidirectionalStream.java", |
| 271 "api/src/org/chromium/net/CronetEngine.java", | 272 "api/src/org/chromium/net/CronetEngine.java", |
| 272 "api/src/org/chromium/net/CronetException.java", | 273 "api/src/org/chromium/net/CronetException.java", |
| 273 "api/src/org/chromium/net/ICronetEngineBuilder.java", | 274 "api/src/org/chromium/net/ICronetEngineBuilder.java", |
| 274 "api/src/org/chromium/net/ImplLoader.java", | 275 "api/src/org/chromium/net/ImplLoader.java", |
| 275 "api/src/org/chromium/net/ExperimentalBidirectionalStream.java", | 276 "api/src/org/chromium/net/ExperimentalBidirectionalStream.java", |
| 276 "api/src/org/chromium/net/ExperimentalCronetEngine.java", | 277 "api/src/org/chromium/net/ExperimentalCronetEngine.java", |
| 277 "api/src/org/chromium/net/ExperimentalUrlRequest.java", | 278 "api/src/org/chromium/net/ExperimentalUrlRequest.java", |
| 278 "api/src/org/chromium/net/InlineExecutionProhibitedException.java", | 279 "api/src/org/chromium/net/InlineExecutionProhibitedException.java", |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 311 java_files = [ | 312 java_files = [ |
| 312 "java/src/org/chromium/net/impl/CronetEngineBase.java", | 313 "java/src/org/chromium/net/impl/CronetEngineBase.java", |
| 313 "java/src/org/chromium/net/impl/CronetEngineBuilderImpl.java", | 314 "java/src/org/chromium/net/impl/CronetEngineBuilderImpl.java", |
| 314 "java/src/org/chromium/net/impl/Preconditions.java", | 315 "java/src/org/chromium/net/impl/Preconditions.java", |
| 315 "java/src/org/chromium/net/impl/UrlRequestBase.java", | 316 "java/src/org/chromium/net/impl/UrlRequestBase.java", |
| 316 "java/src/org/chromium/net/impl/UrlRequestBuilderImpl.java", | 317 "java/src/org/chromium/net/impl/UrlRequestBuilderImpl.java", |
| 317 "java/src/org/chromium/net/impl/UserAgent.java", | 318 "java/src/org/chromium/net/impl/UserAgent.java", |
| 318 ] | 319 ] |
| 319 | 320 |
| 320 deps = [ | 321 deps = [ |
| 321 ":cronet_api", | 322 ":cronet_api_java", |
| 322 "//third_party/android_tools:android_support_annotations_java", | 323 "//third_party/android_tools:android_support_annotations_java", |
| 323 ] | 324 ] |
| 324 | 325 |
| 325 srcjar_deps = cronet_impl_common_java_srcjar_deps | 326 srcjar_deps = cronet_impl_common_java_srcjar_deps |
| 326 } | 327 } |
| 327 | 328 |
| 328 # cronet_impl_platform_java.jar - Java platform based implementation of the Cron
et engine. | 329 # cronet_impl_platform_java.jar - Java platform based implementation of the Cron
et engine. |
| 329 android_library("cronet_impl_platform_java") { | 330 android_library("cronet_impl_platform_java") { |
| 330 java_files = [ | 331 java_files = [ |
| 331 "java/src/org/chromium/net/impl/InputStreamChannel.java", | 332 "java/src/org/chromium/net/impl/InputStreamChannel.java", |
| 332 "java/src/org/chromium/net/impl/JavaCronetEngine.java", | 333 "java/src/org/chromium/net/impl/JavaCronetEngine.java", |
| 333 "java/src/org/chromium/net/impl/JavaUrlRequest.java", | 334 "java/src/org/chromium/net/impl/JavaUrlRequest.java", |
| 334 ] | 335 ] |
| 335 | 336 |
| 336 deps = [ | 337 deps = [ |
| 337 ":cronet_api", | 338 ":cronet_api_java", |
| 338 ":cronet_impl_common_java", | 339 ":cronet_impl_common_java", |
| 339 ] | 340 ] |
| 340 } | 341 } |
| 341 | 342 |
| 342 cronet_impl_native_java_srcjar_deps = [ | 343 cronet_impl_native_java_srcjar_deps = [ |
| 343 ":net_request_priority_java", | 344 ":net_request_priority_java", |
| 344 ":network_quality_observation_source_java", | 345 ":network_quality_observation_source_java", |
| 345 ":url_request_error_java", | 346 ":url_request_error_java", |
| 346 ] | 347 ] |
| 347 | 348 |
| (...skipping 12 matching lines...) Expand all Loading... |
| 360 "java/src/org/chromium/net/urlconnection/CronetFixedModeOutputStream.java", | 361 "java/src/org/chromium/net/urlconnection/CronetFixedModeOutputStream.java", |
| 361 "java/src/org/chromium/net/urlconnection/CronetHttpURLConnection.java", | 362 "java/src/org/chromium/net/urlconnection/CronetHttpURLConnection.java", |
| 362 "java/src/org/chromium/net/urlconnection/CronetHttpURLStreamHandler.java", | 363 "java/src/org/chromium/net/urlconnection/CronetHttpURLStreamHandler.java", |
| 363 "java/src/org/chromium/net/urlconnection/CronetInputStream.java", | 364 "java/src/org/chromium/net/urlconnection/CronetInputStream.java", |
| 364 "java/src/org/chromium/net/urlconnection/CronetOutputStream.java", | 365 "java/src/org/chromium/net/urlconnection/CronetOutputStream.java", |
| 365 "java/src/org/chromium/net/urlconnection/CronetURLStreamHandlerFactory.java"
, | 366 "java/src/org/chromium/net/urlconnection/CronetURLStreamHandlerFactory.java"
, |
| 366 "java/src/org/chromium/net/urlconnection/MessageLoop.java", | 367 "java/src/org/chromium/net/urlconnection/MessageLoop.java", |
| 367 ] | 368 ] |
| 368 | 369 |
| 369 deps = [ | 370 deps = [ |
| 370 ":cronet_api", | 371 ":cronet_api_java", |
| 371 ":cronet_impl_common_java", | 372 ":cronet_impl_common_java", |
| 372 "//base:base_java", | 373 "//base:base_java", |
| 373 "//net/android:net_java", | 374 "//net/android:net_java", |
| 374 "//third_party/android_tools:android_support_annotations_java", | 375 "//third_party/android_tools:android_support_annotations_java", |
| 375 "//third_party/jsr-305:jsr_305_javalib", | 376 "//third_party/jsr-305:jsr_305_javalib", |
| 376 ] | 377 ] |
| 377 | 378 |
| 378 srcjar_deps = cronet_impl_native_java_srcjar_deps | 379 srcjar_deps = cronet_impl_native_java_srcjar_deps |
| 379 } | 380 } |
| 380 | 381 |
| (...skipping 14 matching lines...) Expand all Loading... |
| 395 ] | 396 ] |
| 396 } | 397 } |
| 397 | 398 |
| 398 android_library("cronet_sample_apk_java") { | 399 android_library("cronet_sample_apk_java") { |
| 399 java_files = [ | 400 java_files = [ |
| 400 "sample/src/org/chromium/cronet_sample_apk/CronetSampleActivity.java", | 401 "sample/src/org/chromium/cronet_sample_apk/CronetSampleActivity.java", |
| 401 "sample/src/org/chromium/cronet_sample_apk/CronetSampleApplication.java", | 402 "sample/src/org/chromium/cronet_sample_apk/CronetSampleApplication.java", |
| 402 ] | 403 ] |
| 403 | 404 |
| 404 deps = [ | 405 deps = [ |
| 405 ":cronet_api", | 406 ":cronet_api_java", |
| 406 ":cronet_impl_all_java", | 407 ":cronet_impl_all_java", |
| 407 ":cronet_sample_apk_resources", | 408 ":cronet_sample_apk_resources", |
| 408 "//base:base_java", | 409 "//base:base_java", |
| 409 "//third_party/android_tools:android_support_v7_appcompat_java", | 410 "//third_party/android_tools:android_support_v7_appcompat_java", |
| 410 ] | 411 ] |
| 411 | 412 |
| 412 run_findbugs_override = true | 413 run_findbugs_override = true |
| 413 } | 414 } |
| 414 | 415 |
| 415 android_apk("cronet_sample_apk") { | 416 android_apk("cronet_sample_apk") { |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 448 instrumentation_test_apk("cronet_sample_test_apk") { | 449 instrumentation_test_apk("cronet_sample_test_apk") { |
| 449 apk_name = "CronetSampleTest" | 450 apk_name = "CronetSampleTest" |
| 450 apk_under_test = ":cronet_sample_apk" | 451 apk_under_test = ":cronet_sample_apk" |
| 451 android_manifest = "sample/javatests/AndroidManifest.xml" | 452 android_manifest = "sample/javatests/AndroidManifest.xml" |
| 452 java_files = [ | 453 java_files = [ |
| 453 "sample/javatests/src/org/chromium/cronet_sample_apk/Criteria.java", | 454 "sample/javatests/src/org/chromium/cronet_sample_apk/Criteria.java", |
| 454 "sample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleTest.java", | 455 "sample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleTest.java", |
| 455 ] | 456 ] |
| 456 | 457 |
| 457 deps = [ | 458 deps = [ |
| 458 ":cronet_api", | 459 ":cronet_api_java", |
| 459 ":cronet_impl_all_java", | 460 ":cronet_impl_all_java", |
| 460 ":cronet_sample_apk_java", | 461 ":cronet_sample_apk_java", |
| 461 ":cronet_sample_test_apk_resources", | 462 ":cronet_sample_test_apk_resources", |
| 462 "//base:base_java", | 463 "//base:base_java", |
| 463 "//base:base_java_test_support", | 464 "//base:base_java_test_support", |
| 464 "//net/android:net_java_test_support", | 465 "//net/android:net_java_test_support", |
| 465 ] | 466 ] |
| 466 additional_apks = [ "//net/android:net_test_support_apk" ] | 467 additional_apks = [ "//net/android:net_test_support_apk" ] |
| 467 | 468 |
| 468 run_findbugs_override = true | 469 run_findbugs_override = true |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 556 "test/src/org/chromium/net/MockUrlRequestJobFactory.java", | 557 "test/src/org/chromium/net/MockUrlRequestJobFactory.java", |
| 557 "test/src/org/chromium/net/NativeTestServer.java", | 558 "test/src/org/chromium/net/NativeTestServer.java", |
| 558 "test/src/org/chromium/net/NetworkChangeNotifierUtil.java", | 559 "test/src/org/chromium/net/NetworkChangeNotifierUtil.java", |
| 559 "test/src/org/chromium/net/QuicTestServer.java", | 560 "test/src/org/chromium/net/QuicTestServer.java", |
| 560 "test/src/org/chromium/net/SdchObserver.java", | 561 "test/src/org/chromium/net/SdchObserver.java", |
| 561 "test/src/org/chromium/net/TestFilesInstaller.java", | 562 "test/src/org/chromium/net/TestFilesInstaller.java", |
| 562 "test/src/org/chromium/net/TestUploadDataStreamHandler.java", | 563 "test/src/org/chromium/net/TestUploadDataStreamHandler.java", |
| 563 ] | 564 ] |
| 564 | 565 |
| 565 deps = [ | 566 deps = [ |
| 566 ":cronet_api", | 567 ":cronet_api_java", |
| 567 ":cronet_impl_all_java", | 568 ":cronet_impl_all_java", |
| 568 "//base:base_java", | 569 "//base:base_java", |
| 569 "//base:base_java_test_support", | 570 "//base:base_java_test_support", |
| 570 "//net/android:net_java_test_support", | 571 "//net/android:net_java_test_support", |
| 571 "//third_party/netty-tcnative:netty-tcnative", | 572 "//third_party/netty-tcnative:netty-tcnative", |
| 572 "//third_party/netty4:netty_all", | 573 "//third_party/netty4:netty_all", |
| 573 ] | 574 ] |
| 574 | 575 |
| 575 run_findbugs_override = true | 576 run_findbugs_override = true |
| 576 } | 577 } |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 665 "test/javatests/src/org/chromium/net/urlconnection/CronetHttpURLConnectionTe
st.java", | 666 "test/javatests/src/org/chromium/net/urlconnection/CronetHttpURLConnectionTe
st.java", |
| 666 "test/javatests/src/org/chromium/net/urlconnection/CronetHttpURLStreamHandle
rTest.java", | 667 "test/javatests/src/org/chromium/net/urlconnection/CronetHttpURLStreamHandle
rTest.java", |
| 667 "test/javatests/src/org/chromium/net/urlconnection/CronetURLStreamHandlerFac
toryTest.java", | 668 "test/javatests/src/org/chromium/net/urlconnection/CronetURLStreamHandlerFac
toryTest.java", |
| 668 "test/javatests/src/org/chromium/net/urlconnection/MessageLoopTest.java", | 669 "test/javatests/src/org/chromium/net/urlconnection/MessageLoopTest.java", |
| 669 "test/javatests/src/org/chromium/net/urlconnection/QuicUploadTest.java", | 670 "test/javatests/src/org/chromium/net/urlconnection/QuicUploadTest.java", |
| 670 "test/javatests/src/org/chromium/net/urlconnection/TestUtil.java", | 671 "test/javatests/src/org/chromium/net/urlconnection/TestUtil.java", |
| 671 "test/javatests/src/org/chromium/net/UrlResponseInfoTest.java", | 672 "test/javatests/src/org/chromium/net/UrlResponseInfoTest.java", |
| 672 ] | 673 ] |
| 673 | 674 |
| 674 deps = [ | 675 deps = [ |
| 675 ":cronet_api", | 676 ":cronet_api_java", |
| 676 ":cronet_impl_all_java", | 677 ":cronet_impl_all_java", |
| 677 ":cronet_test_apk_java", | 678 ":cronet_test_apk_java", |
| 678 "//base:base_java", | 679 "//base:base_java", |
| 679 "//base:base_java_test_support", | 680 "//base:base_java_test_support", |
| 680 "//net/android:net_java", | 681 "//net/android:net_java", |
| 681 "//net/android:net_java_test_support", | 682 "//net/android:net_java_test_support", |
| 682 ] | 683 ] |
| 683 | 684 |
| 684 run_findbugs_override = true | 685 run_findbugs_override = true |
| 685 } | 686 } |
| 686 | 687 |
| 687 instrumentation_test_apk("cronet_test_instrumentation_apk") { | 688 instrumentation_test_apk("cronet_test_instrumentation_apk") { |
| 688 apk_name = "CronetTestInstrumentation" | 689 apk_name = "CronetTestInstrumentation" |
| 689 apk_under_test = ":cronet_test_apk" | 690 apk_under_test = ":cronet_test_apk" |
| 690 android_manifest = "test/javatests/AndroidManifest.xml" | 691 android_manifest = "test/javatests/AndroidManifest.xml" |
| 691 | 692 |
| 692 deps = [ | 693 deps = [ |
| 693 ":cronet_api", | 694 ":cronet_api_java", |
| 694 ":cronet_impl_all_java", | 695 ":cronet_impl_all_java", |
| 695 ":cronet_javatests", | 696 ":cronet_javatests", |
| 696 ":cronet_test_apk_java", | 697 ":cronet_test_apk_java", |
| 697 "//base:base_java", | 698 "//base:base_java", |
| 698 "//base:base_java_test_support", | 699 "//base:base_java_test_support", |
| 699 "//net/android:net_java", | 700 "//net/android:net_java", |
| 700 "//net/android:net_java_test_support", | 701 "//net/android:net_java_test_support", |
| 701 ] | 702 ] |
| 702 additional_apks = [ "//net/android:net_test_support_apk" ] | 703 additional_apks = [ "//net/android:net_test_support_apk" ] |
| 703 | 704 |
| 704 data_deps = [ | 705 data_deps = [ |
| 705 "//net:test_support", | 706 "//net:test_support", |
| 706 ] | 707 ] |
| 707 | 708 |
| 708 run_findbugs_override = true | 709 run_findbugs_override = true |
| 709 } | 710 } |
| 710 | 711 |
| 711 android_library("cronet_perf_test_apk_java") { | 712 android_library("cronet_perf_test_apk_java") { |
| 712 testonly = true | 713 testonly = true |
| 713 java_files = | 714 java_files = |
| 714 [ "test/javaperftests/src/org/chromium/net/CronetPerfTestActivity.java" ] | 715 [ "test/javaperftests/src/org/chromium/net/CronetPerfTestActivity.java" ] |
| 715 | 716 |
| 716 deps = [ | 717 deps = [ |
| 717 ":cronet_api", | 718 ":cronet_api_java", |
| 718 ":cronet_impl_all_java", | 719 ":cronet_impl_all_java", |
| 719 ":cronet_javatests", | 720 ":cronet_javatests", |
| 720 ":cronet_test_apk_java", | 721 ":cronet_test_apk_java", |
| 721 "//base:base_java", | 722 "//base:base_java", |
| 722 ] | 723 ] |
| 723 | 724 |
| 724 run_findbugs_override = true | 725 run_findbugs_override = true |
| 725 } | 726 } |
| 726 | 727 |
| 727 android_apk("cronet_perf_test_apk") { | 728 android_apk("cronet_perf_test_apk") { |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 893 args += [ "--src-list-files=${_src_list_files}" ] | 894 args += [ "--src-list-files=${_src_list_files}" ] |
| 894 | 895 |
| 895 inputs = _src_jars | 896 inputs = _src_jars |
| 896 inputs += _src_files | 897 inputs += _src_files |
| 897 inputs += _src_list_files | 898 inputs += _src_list_files |
| 898 } | 899 } |
| 899 } | 900 } |
| 900 | 901 |
| 901 jar_src("jar_cronet_api_source") { | 902 jar_src("jar_cronet_api_source") { |
| 902 src_search_dirs = [ "api/src" ] | 903 src_search_dirs = [ "api/src" ] |
| 903 source_deps = [ ":cronet_api" ] | 904 source_deps = [ ":cronet_api_java" ] |
| 904 srcjar_deps = cronet_api_srcjar_deps | 905 srcjar_deps = cronet_api_srcjar_deps |
| 905 jar_path = "$_package_dir/cronet_api-src.jar" | 906 jar_path = "$_package_dir/cronet_api-src.jar" |
| 906 } | 907 } |
| 907 | 908 |
| 908 jar_src("jar_cronet_impl_common_java_source") { | 909 jar_src("jar_cronet_impl_common_java_source") { |
| 909 src_search_dirs = [ "java/src" ] | 910 src_search_dirs = [ "java/src" ] |
| 910 source_deps = [ ":cronet_impl_common_java" ] | 911 source_deps = [ ":cronet_impl_common_java" ] |
| 911 srcjar_deps = cronet_impl_common_java_srcjar_deps | 912 srcjar_deps = cronet_impl_common_java_srcjar_deps |
| 912 jar_path = "$_package_dir/cronet_impl_common_java-src.jar" | 913 jar_path = "$_package_dir/cronet_impl_common_java-src.jar" |
| 913 } | 914 } |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1010 "$root_out_dir/lib.java/components/cronet/android/cronet_impl_common_java.ja
r", | 1011 "$root_out_dir/lib.java/components/cronet/android/cronet_impl_common_java.ja
r", |
| 1011 "$root_out_dir/lib.java/components/cronet/android/cronet_impl_platform_java.
jar", | 1012 "$root_out_dir/lib.java/components/cronet/android/cronet_impl_platform_java.
jar", |
| 1012 "//AUTHORS", | 1013 "//AUTHORS", |
| 1013 "//chrome/VERSION", | 1014 "//chrome/VERSION", |
| 1014 ] | 1015 ] |
| 1015 outputs = [ | 1016 outputs = [ |
| 1016 "$_package_dir/{{source_file_part}}", | 1017 "$_package_dir/{{source_file_part}}", |
| 1017 ] | 1018 ] |
| 1018 | 1019 |
| 1019 deps = [ | 1020 deps = [ |
| 1020 ":cronet_api", | 1021 ":cronet_api_java", |
| 1021 ":cronet_impl_common_java", | 1022 ":cronet_impl_common_java", |
| 1022 ":cronet_impl_platform_java", | 1023 ":cronet_impl_platform_java", |
| 1023 ] | 1024 ] |
| 1024 } | 1025 } |
| 1025 | 1026 |
| 1026 action("cronet_combine_proguard_flags") { | 1027 action("cronet_combine_proguard_flags") { |
| 1027 script = "//components/cronet/tools/generate_proguard_file.py" | 1028 script = "//components/cronet/tools/generate_proguard_file.py" |
| 1028 outputs = [ | 1029 outputs = [ |
| 1029 "$_package_dir/proguard.cfg", | 1030 "$_package_dir/proguard.cfg", |
| 1030 ] | 1031 ] |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1101 ":jar_cronet_impl_native_java_source", | 1102 ":jar_cronet_impl_native_java_source", |
| 1102 ":jar_cronet_impl_platform_java_source", | 1103 ":jar_cronet_impl_platform_java_source", |
| 1103 ":jar_cronet_sample_source", | 1104 ":jar_cronet_sample_source", |
| 1104 ":repackage_extracted_jars", | 1105 ":repackage_extracted_jars", |
| 1105 ] | 1106 ] |
| 1106 if (current_cpu == "arm" && arm_version == 7) { | 1107 if (current_cpu == "arm" && arm_version == 7) { |
| 1107 deps += [ ":enforce_no_neon" ] | 1108 deps += [ ":enforce_no_neon" ] |
| 1108 } | 1109 } |
| 1109 } | 1110 } |
| 1110 } | 1111 } |
| OLD | NEW |