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

Side by Side Diff: components/cronet/android/BUILD.gn

Issue 2473963003: Fix java target naming exceptions in third_party/ (Closed)
Patch Set: rebase Created 4 years, 1 month 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 | « chrome/android/BUILD.gn ('k') | third_party/custom_tabs_client/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/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 551 matching lines...) Expand 10 before | Expand all | Expand 10 after
562 "test/src/org/chromium/net/TestFilesInstaller.java", 562 "test/src/org/chromium/net/TestFilesInstaller.java",
563 "test/src/org/chromium/net/TestUploadDataStreamHandler.java", 563 "test/src/org/chromium/net/TestUploadDataStreamHandler.java",
564 ] 564 ]
565 565
566 deps = [ 566 deps = [
567 ":cronet_api_java", 567 ":cronet_api_java",
568 ":cronet_impl_all_java", 568 ":cronet_impl_all_java",
569 "//base:base_java", 569 "//base:base_java",
570 "//base:base_java_test_support", 570 "//base:base_java_test_support",
571 "//net/android:net_java_test_support", 571 "//net/android:net_java_test_support",
572 "//third_party/netty-tcnative:netty-tcnative", 572 "//third_party/netty-tcnative:netty-tcnative_java",
573 "//third_party/netty4:netty_all", 573 "//third_party/netty4:netty_all_java",
574 ] 574 ]
575 575
576 run_findbugs_override = true 576 run_findbugs_override = true
577 } 577 }
578 578
579 android_assets("cronet_test_apk_assets") { 579 android_assets("cronet_test_apk_assets") {
580 testonly = true 580 testonly = true
581 581
582 # Need to use renaming_sources to maintain subdirectories. 582 # Need to use renaming_sources to maintain subdirectories.
583 renaming_sources = [ 583 renaming_sources = [
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
621 apk_name = "CronetTest" 621 apk_name = "CronetTest"
622 android_manifest = "test/AndroidManifest.xml" 622 android_manifest = "test/AndroidManifest.xml"
623 shared_libraries = [ ":cronet_tests" ] 623 shared_libraries = [ ":cronet_tests" ]
624 loadable_modules = [ "$root_out_dir/libnetty-tcnative.so" ] 624 loadable_modules = [ "$root_out_dir/libnetty-tcnative.so" ]
625 625
626 deps = [ 626 deps = [
627 ":cronet_test_apk_assets", 627 ":cronet_test_apk_assets",
628 ":cronet_test_apk_java", 628 ":cronet_test_apk_java",
629 ":cronet_test_apk_resources", 629 ":cronet_test_apk_resources",
630 "//base:base_java", 630 "//base:base_java",
631 "//third_party/netty-tcnative:netty-tcnative_all", 631 "//third_party/netty-tcnative:netty-tcnative-so",
632 ] 632 ]
633 633
634 run_findbugs_override = true 634 run_findbugs_override = true
635 } 635 }
636 636
637 android_library("cronet_javatests") { 637 android_library("cronet_javatests") {
638 testonly = true 638 testonly = true
639 639
640 java_files = [ 640 java_files = [
641 "test/javatests/src/org/chromium/net/BidirectionalStreamQuicTest.java", 641 "test/javatests/src/org/chromium/net/BidirectionalStreamQuicTest.java",
(...skipping 460 matching lines...) Expand 10 before | Expand all | Expand 10 after
1102 ":jar_cronet_impl_native_java_source", 1102 ":jar_cronet_impl_native_java_source",
1103 ":jar_cronet_impl_platform_java_source", 1103 ":jar_cronet_impl_platform_java_source",
1104 ":jar_cronet_sample_source", 1104 ":jar_cronet_sample_source",
1105 ":repackage_extracted_jars", 1105 ":repackage_extracted_jars",
1106 ] 1106 ]
1107 if (current_cpu == "arm" && arm_version == 7) { 1107 if (current_cpu == "arm" && arm_version == 7) {
1108 deps += [ ":enforce_no_neon" ] 1108 deps += [ ":enforce_no_neon" ]
1109 } 1109 }
1110 } 1110 }
1111 } 1111 }
OLDNEW
« no previous file with comments | « chrome/android/BUILD.gn ('k') | third_party/custom_tabs_client/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698