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

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

Issue 2892493002: Replace sanitizers:deps with exe_and_shlib_deps (Chromium repo only) (Closed)
Patch Set: Fix find/replace error in nacl 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 | « chrome/BUILD.gn ('k') | chrome/chrome_watcher/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 631 matching lines...) Expand 10 before | Expand all | Expand 10 after
642 res_dir = "java/res_template" 642 res_dir = "java/res_template"
643 variables = chrome_sync_shell_jinja_variables 643 variables = chrome_sync_shell_jinja_variables
644 } 644 }
645 645
646 shared_library("chrome") { 646 shared_library("chrome") {
647 sources = [ 647 sources = [
648 "../app/android/chrome_main_delegate_android_initializer.cc", 648 "../app/android/chrome_main_delegate_android_initializer.cc",
649 "../browser/android/chrome_entry_point.cc", 649 "../browser/android/chrome_entry_point.cc",
650 ] 650 ]
651 deps = [ 651 deps = [
652 "//build/config/sanitizers:deps", 652 "//build/config:exe_and_shlib_deps",
653 "//chrome:chrome_android_core", 653 "//chrome:chrome_android_core",
654 ] 654 ]
655 655
656 if (enable_vr) { 656 if (enable_vr) {
657 # Ensure libgvr static library appears before gcc library in linking order. 657 # Ensure libgvr static library appears before gcc library in linking order.
658 # See https://crbug.com/704305 for details. 658 # See https://crbug.com/704305 for details.
659 libs = 659 libs =
660 [ "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a" ] 660 [ "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a" ]
661 } 661 }
662 662
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
769 769
770 shared_library("chrome_sync_shell") { 770 shared_library("chrome_sync_shell") {
771 testonly = true 771 testonly = true
772 sources = [ 772 sources = [
773 "../browser/android/chrome_entry_point.cc", 773 "../browser/android/chrome_entry_point.cc",
774 "../browser/android/chrome_sync_shell_main_delegate.cc", 774 "../browser/android/chrome_sync_shell_main_delegate.cc",
775 "../browser/android/chrome_sync_shell_main_delegate.h", 775 "../browser/android/chrome_sync_shell_main_delegate.h",
776 "../browser/android/chrome_sync_shell_main_delegate_initializer.cc", 776 "../browser/android/chrome_sync_shell_main_delegate_initializer.cc",
777 ] 777 ]
778 deps = [ 778 deps = [
779 "//build/config/sanitizers:deps", 779 "//build/config:exe_and_shlib_deps",
780 "//chrome:chrome_android_core", 780 "//chrome:chrome_android_core",
781 "//components/sync", 781 "//components/sync",
782 "//components/sync:test_support_fake_server_android", 782 "//components/sync:test_support_fake_server_android",
783 ] 783 ]
784 if (enable_vr) { 784 if (enable_vr) {
785 # Ensure libgvr static library appears before gcc library in linking order. 785 # Ensure libgvr static library appears before gcc library in linking order.
786 # See https://crbug.com/704305 for details. 786 # See https://crbug.com/704305 for details.
787 libs = 787 libs =
788 [ "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a" ] 788 [ "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a" ]
789 } 789 }
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
964 apk_name = "ChromeSyncShellTest" 964 apk_name = "ChromeSyncShellTest"
965 apk_under_test = ":chrome_sync_shell_apk" 965 apk_under_test = ":chrome_sync_shell_apk"
966 android_manifest = chrome_sync_shell_test_apk_manifest 966 android_manifest = chrome_sync_shell_test_apk_manifest
967 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest" 967 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
968 deps = [ 968 deps = [
969 ":chrome_sync_shell_test_apk_java", 969 ":chrome_sync_shell_test_apk_java",
970 "//third_party/android_support_test_runner:runner_java", 970 "//third_party/android_support_test_runner:runner_java",
971 ] 971 ]
972 proguard_enabled = !is_java_debug 972 proguard_enabled = !is_java_debug
973 } 973 }
OLDNEW
« no previous file with comments | « chrome/BUILD.gn ('k') | chrome/chrome_watcher/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698