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

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

Issue 1943583002: GN: forward_variables_from shouldn't clobber vars. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
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 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 ] 260 ]
261 261
262 srcjar_deps = [ 262 srcjar_deps = [
263 ":cronet_version_srcjar", 263 ":cronet_version_srcjar",
264 ":http_cache_type_java", 264 ":http_cache_type_java",
265 ":url_request_error_java", 265 ":url_request_error_java",
266 ":load_states_list", 266 ":load_states_list",
267 ":network_quality_observations_java", 267 ":network_quality_observations_java",
268 ] 268 ]
269 269
270 run_findbugs = true 270 run_findbugs_override = true
271 } 271 }
272 272
273 android_library("cronet_java") { 273 android_library("cronet_java") {
274 java_files = [ 274 java_files = [
275 "java/src/org/chromium/net/ChromiumUrlRequest.java", 275 "java/src/org/chromium/net/ChromiumUrlRequest.java",
276 "java/src/org/chromium/net/ChromiumUrlRequestContext.java", 276 "java/src/org/chromium/net/ChromiumUrlRequestContext.java",
277 "java/src/org/chromium/net/ChromiumUrlRequestFactory.java", 277 "java/src/org/chromium/net/ChromiumUrlRequestFactory.java",
278 "java/src/org/chromium/net/CronetBidirectionalStream.java", 278 "java/src/org/chromium/net/CronetBidirectionalStream.java",
279 "java/src/org/chromium/net/CronetLibraryLoader.java", 279 "java/src/org/chromium/net/CronetLibraryLoader.java",
280 "java/src/org/chromium/net/CronetUploadDataStream.java", 280 "java/src/org/chromium/net/CronetUploadDataStream.java",
(...skipping 16 matching lines...) Expand all
297 "//net/android:net_java", 297 "//net/android:net_java",
298 "//third_party/android_tools:android_support_annotations_javalib", 298 "//third_party/android_tools:android_support_annotations_javalib",
299 "//third_party/jsr-305:jsr_305_javalib", 299 "//third_party/jsr-305:jsr_305_javalib",
300 ] 300 ]
301 301
302 srcjar_deps = [ 302 srcjar_deps = [
303 ":chromium_url_request_java", 303 ":chromium_url_request_java",
304 ":net_request_priority_java", 304 ":net_request_priority_java",
305 ] 305 ]
306 306
307 run_findbugs = true 307 run_findbugs_override = true
308 } 308 }
309 309
310 android_resources("cronet_sample_apk_resources") { 310 android_resources("cronet_sample_apk_resources") {
311 resource_dirs = [ "sample/res" ] 311 resource_dirs = [ "sample/res" ]
312 android_manifest = "sample/AndroidManifest.xml" 312 android_manifest = "sample/AndroidManifest.xml"
313 } 313 }
314 314
315 android_library("cronet_sample_apk_java") { 315 android_library("cronet_sample_apk_java") {
316 java_files = [ 316 java_files = [
317 "sample/src/org/chromium/cronet_sample_apk/CronetSampleActivity.java", 317 "sample/src/org/chromium/cronet_sample_apk/CronetSampleActivity.java",
318 "sample/src/org/chromium/cronet_sample_apk/CronetSampleApplication.java", 318 "sample/src/org/chromium/cronet_sample_apk/CronetSampleApplication.java",
319 ] 319 ]
320 320
321 deps = [ 321 deps = [
322 ":cronet_api", 322 ":cronet_api",
323 ":cronet_java", 323 ":cronet_java",
324 ":cronet_sample_apk_resources", 324 ":cronet_sample_apk_resources",
325 "//base:base_java", 325 "//base:base_java",
326 ] 326 ]
327 327
328 run_findbugs = true 328 run_findbugs_override = true
329 } 329 }
330 330
331 android_apk("cronet_sample_apk") { 331 android_apk("cronet_sample_apk") {
332 apk_name = "CronetSample" 332 apk_name = "CronetSample"
333 android_manifest = "sample/AndroidManifest.xml" 333 android_manifest = "sample/AndroidManifest.xml"
334 native_libs = [ "libcronet.so" ] 334 native_libs = [ "libcronet.so" ]
335 335
336 deps = [ 336 deps = [
337 ":cronet", 337 ":cronet",
338 ":cronet_sample_apk_java", 338 ":cronet_sample_apk_java",
339 ":cronet_sample_apk_resources", 339 ":cronet_sample_apk_resources",
340 "//base:base_java", 340 "//base:base_java",
341 "//third_party/jsr-305:jsr_305_javalib", 341 "//third_party/jsr-305:jsr_305_javalib",
342 ] 342 ]
343 343
344 run_findbugs = true 344 run_findbugs_override = true
345 if (!is_debug) { 345 if (!is_debug) {
346 proguard_enabled = true 346 proguard_enabled = true
347 proguard_configs = [ 347 proguard_configs = [
348 "proguard.cfg", 348 "proguard.cfg",
349 "sample/javatests/proguard.cfg", 349 "sample/javatests/proguard.cfg",
350 ] 350 ]
351 } 351 }
352 } 352 }
353 353
354 # cronet_sample_test_apk_resources is identical to 354 # cronet_sample_test_apk_resources is identical to
(...skipping 18 matching lines...) Expand all
373 ":cronet_api", 373 ":cronet_api",
374 ":cronet_java", 374 ":cronet_java",
375 ":cronet_sample_apk_java", 375 ":cronet_sample_apk_java",
376 ":cronet_sample_test_apk_resources", 376 ":cronet_sample_test_apk_resources",
377 "//base:base_java", 377 "//base:base_java",
378 "//base:base_java_test_support", 378 "//base:base_java_test_support",
379 "//net/android:net_java_test_support", 379 "//net/android:net_java_test_support",
380 ] 380 ]
381 additional_apks = [ "//net/android:net_test_support_apk" ] 381 additional_apks = [ "//net/android:net_test_support_apk" ]
382 382
383 run_findbugs = true 383 run_findbugs_override = true
384 proguard_enabled = !is_debug 384 proguard_enabled = !is_debug
385 } 385 }
386 386
387 generate_jni("cronet_tests_jni_headers") { 387 generate_jni("cronet_tests_jni_headers") {
388 testonly = true 388 testonly = true
389 sources = [ 389 sources = [
390 "test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java", 390 "test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java",
391 "test/src/org/chromium/net/CronetTestUtil.java", 391 "test/src/org/chromium/net/CronetTestUtil.java",
392 "test/src/org/chromium/net/MockCertVerifier.java", 392 "test/src/org/chromium/net/MockCertVerifier.java",
393 "test/src/org/chromium/net/MockUrlRequestJobFactory.java", 393 "test/src/org/chromium/net/MockUrlRequestJobFactory.java",
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 478
479 deps = [ 479 deps = [
480 ":cronet_api", 480 ":cronet_api",
481 ":cronet_java", 481 ":cronet_java",
482 "//base:base_java", 482 "//base:base_java",
483 "//net/android:net_java_test_support", 483 "//net/android:net_java_test_support",
484 "//third_party/netty-tcnative:netty-tcnative", 484 "//third_party/netty-tcnative:netty-tcnative",
485 "//third_party/netty4:netty_all", 485 "//third_party/netty4:netty_all",
486 ] 486 ]
487 487
488 run_findbugs = true 488 run_findbugs_override = true
489 } 489 }
490 490
491 android_assets("cronet_test_apk_assets") { 491 android_assets("cronet_test_apk_assets") {
492 testonly = true 492 testonly = true
493 493
494 # Need to use renaming_sources to maintain subdirectories. 494 # Need to use renaming_sources to maintain subdirectories.
495 renaming_sources = [ 495 renaming_sources = [
496 "test/assets/test/cacheable.txt", 496 "test/assets/test/cacheable.txt",
497 "test/assets/test/cacheable.txt.mock-http-headers", 497 "test/assets/test/cacheable.txt.mock-http-headers",
498 "test/assets/test/content_length_mismatch.html", 498 "test/assets/test/content_length_mismatch.html",
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
537 537
538 deps = [ 538 deps = [
539 ":cronet_test_apk_assets", 539 ":cronet_test_apk_assets",
540 ":cronet_test_apk_java", 540 ":cronet_test_apk_java",
541 ":cronet_test_apk_resources", 541 ":cronet_test_apk_resources",
542 ":cronet_tests", 542 ":cronet_tests",
543 "//base:base_java", 543 "//base:base_java",
544 "//third_party/netty-tcnative:netty-tcnative_all", 544 "//third_party/netty-tcnative:netty-tcnative_all",
545 ] 545 ]
546 546
547 run_findbugs = true 547 run_findbugs_override = true
548 } 548 }
549 549
550 android_library("cronet_javatests") { 550 android_library("cronet_javatests") {
551 testonly = true 551 testonly = true
552 552
553 java_files = [ 553 java_files = [
554 "test/javatests/src/org/chromium/net/BidirectionalStreamQuicTest.java", 554 "test/javatests/src/org/chromium/net/BidirectionalStreamQuicTest.java",
555 "test/javatests/src/org/chromium/net/BidirectionalStreamTest.java", 555 "test/javatests/src/org/chromium/net/BidirectionalStreamTest.java",
556 "test/javatests/src/org/chromium/net/ChromiumUrlRequestTest.java", 556 "test/javatests/src/org/chromium/net/ChromiumUrlRequestTest.java",
557 "test/javatests/src/org/chromium/net/ChunkedWritableByteChannelTest.java", 557 "test/javatests/src/org/chromium/net/ChunkedWritableByteChannelTest.java",
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
590 deps = [ 590 deps = [
591 ":cronet_api", 591 ":cronet_api",
592 ":cronet_java", 592 ":cronet_java",
593 ":cronet_test_apk_java", 593 ":cronet_test_apk_java",
594 "//base:base_java", 594 "//base:base_java",
595 "//base:base_java_test_support", 595 "//base:base_java_test_support",
596 "//net/android:net_java", 596 "//net/android:net_java",
597 "//net/android:net_java_test_support", 597 "//net/android:net_java_test_support",
598 ] 598 ]
599 599
600 run_findbugs = true 600 run_findbugs_override = true
601 } 601 }
602 602
603 instrumentation_test_apk("cronet_test_instrumentation_apk") { 603 instrumentation_test_apk("cronet_test_instrumentation_apk") {
604 apk_name = "CronetTestInstrumentation" 604 apk_name = "CronetTestInstrumentation"
605 apk_under_test = ":cronet_test_apk" 605 apk_under_test = ":cronet_test_apk"
606 android_manifest = "test/javatests/AndroidManifest.xml" 606 android_manifest = "test/javatests/AndroidManifest.xml"
607 607
608 deps = [ 608 deps = [
609 ":cronet_api", 609 ":cronet_api",
610 ":cronet_java", 610 ":cronet_java",
611 ":cronet_javatests", 611 ":cronet_javatests",
612 ":cronet_test_apk_java", 612 ":cronet_test_apk_java",
613 "//base:base_java", 613 "//base:base_java",
614 "//base:base_java_test_support", 614 "//base:base_java_test_support",
615 "//net/android:net_java", 615 "//net/android:net_java",
616 "//net/android:net_java_test_support", 616 "//net/android:net_java_test_support",
617 ] 617 ]
618 additional_apks = [ "//net/android:net_test_support_apk" ] 618 additional_apks = [ "//net/android:net_test_support_apk" ]
619 619
620 data = [ 620 data = [
621 "//net/data/ssl/certificates/quic_test.example.com.crt", 621 "//net/data/ssl/certificates/quic_test.example.com.crt",
622 "//net/data/ssl/certificates/quic_test.example.com.key", 622 "//net/data/ssl/certificates/quic_test.example.com.key",
623 "//net/data/ssl/certificates/quic_test.example.com.key.pkcs8", 623 "//net/data/ssl/certificates/quic_test.example.com.key.pkcs8",
624 "//net/data/ssl/certificates/quic_test.example.com.key.sct", 624 "//net/data/ssl/certificates/quic_test.example.com.key.sct",
625 ] 625 ]
626 626
627 # TODO(jbudorick): Remove this once GN uses the generated .isolate files. 627 # TODO(jbudorick): Remove this once GN uses the generated .isolate files.
628 isolate_file = "cronet_test_instrumentation_apk.isolate" 628 isolate_file = "cronet_test_instrumentation_apk.isolate"
629 629
630 run_findbugs = true 630 run_findbugs_override = true
631 } 631 }
632 632
633 android_library("cronet_perf_test_apk_java") { 633 android_library("cronet_perf_test_apk_java") {
634 testonly = true 634 testonly = true
635 java_files = 635 java_files =
636 [ "test/javaperftests/src/org/chromium/net/CronetPerfTestActivity.java" ] 636 [ "test/javaperftests/src/org/chromium/net/CronetPerfTestActivity.java" ]
637 637
638 deps = [ 638 deps = [
639 ":cronet_api", 639 ":cronet_api",
640 ":cronet_java", 640 ":cronet_java",
641 ":cronet_javatests", 641 ":cronet_javatests",
642 ":cronet_test_apk_java", 642 ":cronet_test_apk_java",
643 "//base:base_java", 643 "//base:base_java",
644 ] 644 ]
645 645
646 run_findbugs = true 646 run_findbugs_override = true
647 } 647 }
648 648
649 android_apk("cronet_perf_test_apk") { 649 android_apk("cronet_perf_test_apk") {
650 testonly = true 650 testonly = true
651 apk_name = "CronetPerfTest" 651 apk_name = "CronetPerfTest"
652 android_manifest = "test/javaperftests/AndroidManifest.xml" 652 android_manifest = "test/javaperftests/AndroidManifest.xml"
653 native_libs = [ "libcronet_tests.so" ] 653 native_libs = [ "libcronet_tests.so" ]
654 654
655 deps = [ 655 deps = [
656 ":cronet_perf_test_apk_java", 656 ":cronet_perf_test_apk_java",
657 ":cronet_test_apk_java", 657 ":cronet_test_apk_java",
658 ":cronet_tests", 658 ":cronet_tests",
659 "//base:base_java", 659 "//base:base_java",
660 ] 660 ]
661 661
662 run_findbugs = true 662 run_findbugs_override = true
663 proguard_enabled = true 663 proguard_enabled = true
664 proguard_configs = [ 664 proguard_configs = [
665 "proguard.cfg", 665 "proguard.cfg",
666 "test/javaperftests/proguard.cfg", 666 "test/javaperftests/proguard.cfg",
667 ] 667 ]
668 } 668 }
669 669
670 test("cronet_unittests") { 670 test("cronet_unittests") {
671 sources = [ 671 sources = [
672 "//components/cronet/histogram_manager_unittest.cc", 672 "//components/cronet/histogram_manager_unittest.cc",
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
869 ":cronet_package_copy_native_lib", 869 ":cronet_package_copy_native_lib",
870 ":cronet_package_copy_native_lib_unstripped", 870 ":cronet_package_copy_native_lib_unstripped",
871 ":generate_javadoc", 871 ":generate_javadoc",
872 ":generate_licenses", 872 ":generate_licenses",
873 ":jar_cronet_api_source", 873 ":jar_cronet_api_source",
874 ":jar_cronet_other_source", 874 ":jar_cronet_other_source",
875 ":jar_cronet_sample_source", 875 ":jar_cronet_sample_source",
876 ":repackage_extracted_jars", 876 ":repackage_extracted_jars",
877 ] 877 ]
878 } 878 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698