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

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

Issue 2793033003: [Android] Remove org.apache.http from proguard flags and gn. (Closed)
Patch Set: rebase and git cl format Created 3 years, 8 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 | « build/secondary/third_party/android_tools/BUILD.gn ('k') | chrome/test/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 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("//android_webview/webview_repack_locales_list.gni") 5 import("//android_webview/webview_repack_locales_list.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("//chrome/android/chrome_public_apk_tmpl.gni") 9 import("//chrome/android/chrome_public_apk_tmpl.gni")
10 import("//chrome/android/monochrome_android_manifest_jinja_variables.gni") 10 import("//chrome/android/monochrome_android_manifest_jinja_variables.gni")
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after
457 "//printing:printing_java", 457 "//printing:printing_java",
458 "//third_party/WebKit/public:android_mojo_bindings_java", 458 "//third_party/WebKit/public:android_mojo_bindings_java",
459 "//third_party/WebKit/public:blink_headers_java", 459 "//third_party/WebKit/public:blink_headers_java",
460 "//third_party/WebKit/public:mojo_bindings_java", 460 "//third_party/WebKit/public:mojo_bindings_java",
461 "//third_party/android_support_test_runner:rules_java", 461 "//third_party/android_support_test_runner:rules_java",
462 "//third_party/android_support_test_runner:runner_java", 462 "//third_party/android_support_test_runner:runner_java",
463 "//third_party/android_tools:android_support_design_java", 463 "//third_party/android_tools:android_support_design_java",
464 "//third_party/android_tools:android_support_transition_java", 464 "//third_party/android_tools:android_support_transition_java",
465 "//third_party/android_tools:android_support_v7_appcompat_java", 465 "//third_party/android_tools:android_support_v7_appcompat_java",
466 "//third_party/android_tools:android_support_v7_recyclerview_java", 466 "//third_party/android_tools:android_support_v7_recyclerview_java",
467 "//third_party/android_tools:legacy_http_javalib",
468 "//third_party/cacheinvalidation:cacheinvalidation_javalib", 467 "//third_party/cacheinvalidation:cacheinvalidation_javalib",
469 "//third_party/custom_tabs_client:custom_tabs_support_java", 468 "//third_party/custom_tabs_client:custom_tabs_support_java",
470 "//third_party/hamcrest:hamcrest_java", 469 "//third_party/hamcrest:hamcrest_java",
471 "//third_party/jsr-305:jsr_305_javalib", 470 "//third_party/jsr-305:jsr_305_javalib",
472 "//third_party/junit", 471 "//third_party/junit",
473 "//ui/android:ui_java", 472 "//ui/android:ui_java",
474 "//ui/android:ui_javatests", 473 "//ui/android:ui_javatests",
475 "//ui/base/mojo:mojo_bindings_java", 474 "//ui/base/mojo:mojo_bindings_java",
476 google_play_services_library, 475 google_play_services_library,
477 ] 476 ]
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
615 "../browser/android/chrome_entry_point.cc", 614 "../browser/android/chrome_entry_point.cc",
616 ] 615 ]
617 deps = [ 616 deps = [
618 "//build/config/sanitizers:deps", 617 "//build/config/sanitizers:deps",
619 "//chrome:chrome_android_core", 618 "//chrome:chrome_android_core",
620 ] 619 ]
621 620
622 if (enable_vr) { 621 if (enable_vr) {
623 # Ensure libgvr static library appears before gcc library in linking order. 622 # Ensure libgvr static library appears before gcc library in linking order.
624 # See https://crbug.com/704305 for details. 623 # See https://crbug.com/704305 for details.
625 libs = [ 624 libs =
626 "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a", 625 [ "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a" ]
627 ]
628 } 626 }
629 627
630 if (is_android && use_order_profiling) { 628 if (is_android && use_order_profiling) {
631 deps += [ "//tools/cygprofile" ] 629 deps += [ "//tools/cygprofile" ]
632 } 630 }
633 631
634 # See crbug.com/705088 for more info. 632 # See crbug.com/705088 for more info.
635 if (is_android && target_cpu == "arm" && is_asan) { 633 if (is_android && target_cpu == "arm" && is_asan) {
636 ldflags = [ "-Wl,--long-plt" ] 634 ldflags = [ "-Wl,--long-plt" ]
637 } 635 }
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
708 "../browser/android/monochrome_entry_point.cc", 706 "../browser/android/monochrome_entry_point.cc",
709 ] 707 ]
710 deps = [ 708 deps = [
711 "//android_webview:common", 709 "//android_webview:common",
712 "//chrome:chrome_android_core", 710 "//chrome:chrome_android_core",
713 ] 711 ]
714 712
715 if (enable_vr) { 713 if (enable_vr) {
716 # Ensure libgvr static library appears before gcc library in linking order . 714 # Ensure libgvr static library appears before gcc library in linking order .
717 # See https://crbug.com/704305 for details. 715 # See https://crbug.com/704305 for details.
718 libs = [ 716 libs = [ "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}. a" ]
719 "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a",
720 ]
721 } 717 }
722 718
723 configs -= [ "//build/config/android:hide_all_but_jni_onload" ] 719 configs -= [ "//build/config/android:hide_all_but_jni_onload" ]
724 configs += [ "//build/config/android:hide_all_but_jni" ] 720 configs += [ "//build/config/android:hide_all_but_jni" ]
725 if (is_android && use_order_profiling) { 721 if (is_android && use_order_profiling) {
726 deps += [ "//tools/cygprofile" ] 722 deps += [ "//tools/cygprofile" ]
727 } 723 }
728 724
729 public_configs = extra_chrome_shared_library_configs 725 public_configs = extra_chrome_shared_library_configs
730 } 726 }
(...skipping 15 matching lines...) Expand all
746 ] 742 ]
747 deps = [ 743 deps = [
748 "//build/config/sanitizers:deps", 744 "//build/config/sanitizers:deps",
749 "//chrome:chrome_android_core", 745 "//chrome:chrome_android_core",
750 "//components/sync", 746 "//components/sync",
751 "//components/sync:test_support_fake_server_android", 747 "//components/sync:test_support_fake_server_android",
752 ] 748 ]
753 if (enable_vr) { 749 if (enable_vr) {
754 # Ensure libgvr static library appears before gcc library in linking order. 750 # Ensure libgvr static library appears before gcc library in linking order.
755 # See https://crbug.com/704305 for details. 751 # See https://crbug.com/704305 for details.
756 libs = [ 752 libs =
757 "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a", 753 [ "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a" ]
758 ]
759 } 754 }
760 } 755 }
761 756
762 # Contains rules common to chrome_public_apk and chrome_sync_shell_apk 757 # Contains rules common to chrome_public_apk and chrome_sync_shell_apk
763 template("chrome_public_apk_tmpl_shared") { 758 template("chrome_public_apk_tmpl_shared") {
764 chrome_public_apk_tmpl(target_name) { 759 chrome_public_apk_tmpl(target_name) {
765 forward_variables_from(invoker, "*") 760 forward_variables_from(invoker, "*")
766 if (!defined(deps)) { 761 if (!defined(deps)) {
767 deps = [] 762 deps = []
768 } 763 }
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
929 apk_name = "ChromeSyncShellTest" 924 apk_name = "ChromeSyncShellTest"
930 apk_under_test = ":chrome_sync_shell_apk" 925 apk_under_test = ":chrome_sync_shell_apk"
931 android_manifest = chrome_sync_shell_test_apk_manifest 926 android_manifest = chrome_sync_shell_test_apk_manifest
932 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest" 927 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
933 deps = [ 928 deps = [
934 ":chrome_sync_shell_test_apk_java", 929 ":chrome_sync_shell_test_apk_java",
935 "//third_party/android_support_test_runner:runner_java", 930 "//third_party/android_support_test_runner:runner_java",
936 ] 931 ]
937 proguard_enabled = !is_java_debug 932 proguard_enabled = !is_java_debug
938 } 933 }
OLDNEW
« no previous file with comments | « build/secondary/third_party/android_tools/BUILD.gn ('k') | chrome/test/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698