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

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

Issue 2853373005: Android: Enable --long-plt for arm32 when order profiling is enabled. (Closed)
Patch Set: Created 3 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
« no previous file with comments | « no previous file | no next file » | 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 626 matching lines...) Expand 10 before | Expand all | Expand 10 after
637 "//chrome:chrome_android_core", 637 "//chrome:chrome_android_core",
638 ] 638 ]
639 639
640 if (enable_vr) { 640 if (enable_vr) {
641 # Ensure libgvr static library appears before gcc library in linking order. 641 # Ensure libgvr static library appears before gcc library in linking order.
642 # See https://crbug.com/704305 for details. 642 # See https://crbug.com/704305 for details.
643 libs = 643 libs =
644 [ "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a" ] 644 [ "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a" ]
645 } 645 }
646 646
647 if (is_android && use_order_profiling) { 647 if (use_order_profiling) {
648 deps += [ "//tools/cygprofile" ] 648 deps += [ "//tools/cygprofile" ]
649 } 649 }
650 650
651 # See crbug.com/705088 for more info. 651 # See crbug.com/705088, crbug.com/717815.
652 if (is_android && target_cpu == "arm" && is_asan) { 652 if (target_cpu == "arm" && (is_asan || use_order_profiling)) {
653 ldflags = [ "-Wl,--long-plt" ] 653 ldflags = [ "-Wl,--long-plt" ]
654 } 654 }
655 655
656 public_configs = extra_chrome_shared_library_configs 656 public_configs = extra_chrome_shared_library_configs
657 } 657 }
658 658
659 # Ensure that .pak files are built only once (build them in the default 659 # Ensure that .pak files are built only once (build them in the default
660 # toolchain). 660 # toolchain).
661 if (current_toolchain == default_toolchain) { 661 if (current_toolchain == default_toolchain) {
662 if (enable_resource_whitelist_generation) { 662 if (enable_resource_whitelist_generation) {
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
948 apk_name = "ChromeSyncShellTest" 948 apk_name = "ChromeSyncShellTest"
949 apk_under_test = ":chrome_sync_shell_apk" 949 apk_under_test = ":chrome_sync_shell_apk"
950 android_manifest = chrome_sync_shell_test_apk_manifest 950 android_manifest = chrome_sync_shell_test_apk_manifest
951 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest" 951 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
952 deps = [ 952 deps = [
953 ":chrome_sync_shell_test_apk_java", 953 ":chrome_sync_shell_test_apk_java",
954 "//third_party/android_support_test_runner:runner_java", 954 "//third_party/android_support_test_runner:runner_java",
955 ] 955 ]
956 proguard_enabled = !is_java_debug 956 proguard_enabled = !is_java_debug
957 } 957 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698