Skip to content

Commit

Permalink
Replace sanitizers:deps with exe_and_shlib_deps (Chromium repo only)
Browse files Browse the repository at this point in the history
BUG=723069
R=brettw@chromium.org,xhwang@chromium.org
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.android:android_cronet_tester;master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:closure_compilation;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win10_chromium_x64_rel_ng;master.tryserver.chromium.win:win_optional_gpu_tests_rel

Review-Url: https://codereview.chromium.org/2892493002
Cr-Commit-Position: refs/heads/master@{#472971}
  • Loading branch information
tanderson-google authored and Commit bot committed May 18, 2017
1 parent 576b449 commit 84fa8b0
Show file tree
Hide file tree
Showing 82 changed files with 161 additions and 161 deletions.
2 changes: 1 addition & 1 deletion ash/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -1506,7 +1506,7 @@ executable("ash_shell_with_content") {
deps = [
":ash_shell_lib_with_content",
"//base",
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
"//build/win:default_exe_manifest",
"//components/user_manager",
"//content",
Expand Down
8 changes: 4 additions & 4 deletions base/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -1786,7 +1786,7 @@ if (!is_ios) {
]
deps = [
":base",
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
"//build/win:default_exe_manifest",
"//third_party/icu:icuuc",
]
Expand All @@ -1798,7 +1798,7 @@ if (!is_ios) {
]
deps = [
":base",
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
"//build/win:default_exe_manifest",
]
}
Expand Down Expand Up @@ -1834,7 +1834,7 @@ if (is_win) {
"shell32.lib",
]
deps = [
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
]
}

Expand All @@ -1857,7 +1857,7 @@ if (is_win || is_mac) {
"profiler/test_support_library.cc",
]
deps = [
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
]
}
}
Expand Down
2 changes: 1 addition & 1 deletion base/android/linker/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ shared_library("chromium_android_linker") {
# '<(android_ndk_root)/crazy_linker.gyp:crazy_linker'
# However, we use our own fork. See bug 384700.
deps = [
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
"//third_party/android_crazy_linker",
]
}
2 changes: 1 addition & 1 deletion base/test/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ if (is_linux) {
]
deps = [
"//base",
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
]
}
}
Expand Down
26 changes: 13 additions & 13 deletions breakpad/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ if (!is_win) {

deps = [
":stackwalk_common",
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
]

defines = [ "BPLOG_MINIMUM_SEVERITY=SEVERITY_ERROR" ]
Expand All @@ -215,7 +215,7 @@ if (!is_win) {

deps = [
":stackwalk_common",
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
]

defines = [ "BPLOG_MINIMUM_SEVERITY=SEVERITY_ERROR" ]
Expand Down Expand Up @@ -260,7 +260,7 @@ if (!is_win) {
configs += [ "//build/config/compiler:no_chromium_code" ]

deps = [
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
]
}
} else {
Expand Down Expand Up @@ -340,7 +340,7 @@ if (is_mac) {
}

deps = [
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
]
}

Expand All @@ -358,7 +358,7 @@ if (is_mac) {
configs += [ "//build/config/compiler:no_chromium_code" ]

deps = [
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
]
}
} else {
Expand Down Expand Up @@ -430,7 +430,7 @@ if (is_mac) {

deps = [
":utilities",
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
]
}

Expand Down Expand Up @@ -493,7 +493,7 @@ if (is_linux || is_android) {
libs = [ "dl" ]

deps = [
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
]
}

Expand Down Expand Up @@ -556,7 +556,7 @@ if (is_linux || is_android) {
include_dirs = [ "src" ]

deps = [
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
]
}
} else {
Expand Down Expand Up @@ -721,7 +721,7 @@ if (is_linux || is_android) {
":client",
":linux_dumper_unittest_helper",
":processor_support",
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
"//testing/gmock",
"//testing/gtest",
"//testing/gtest:gtest_main",
Expand Down Expand Up @@ -768,7 +768,7 @@ if (is_linux || is_android) {
]
deps = [
":processor_support",
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
]

configs += [ ":client_config" ]
Expand All @@ -790,7 +790,7 @@ if (is_linux || is_android) {

deps = [
":client",
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
]

if (is_android) {
Expand All @@ -808,7 +808,7 @@ if (is_linux || is_android) {

deps = [
":client",
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
]
}

Expand All @@ -820,7 +820,7 @@ if (is_linux || is_android) {

deps = [
":client",
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
]

include_dirs = [ "src" ]
Expand Down
12 changes: 6 additions & 6 deletions chrome/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ if (!is_android && !is_mac) {
defines = []
public_deps = []
deps = [
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
"//printing/features",
]

Expand Down Expand Up @@ -347,7 +347,7 @@ if (is_win) {
":chrome_dll_manifest",
":chrome_dll_version",
"//base/trace_event/etw_manifest:chrome_events_win",
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
"//chrome/app:chrome_dll_resources",
"//chrome/app:command_ids",
"//chrome/app/theme:chrome_unscaled_resources",
Expand Down Expand Up @@ -443,7 +443,7 @@ if (is_win) {
":child_dependencies",
":chrome_child_manifest",
":chrome_dll_version",
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
"//chrome/browser/policy:path_parser",
"//chrome/common:features",
"//chrome/install_static:install_static_util",
Expand Down Expand Up @@ -558,7 +558,7 @@ if (is_win) {
":chrome_app_strings_bundle_data",
":chrome_resources",
":chrome_versioned_bundle_data",
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
"//chrome/common:version_header",
]

Expand Down Expand Up @@ -744,7 +744,7 @@ if (is_win) {
defines = [ "HELPER_EXECUTABLE" ]

deps = [
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
"//chrome/common:version_header",
]

Expand Down Expand Up @@ -1178,7 +1178,7 @@ if (is_win) {
":chrome_framework_services",
":packed_resources",
":widevine_cdm_library",
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
"//chrome/app/nibs:chrome_xibs",
]

Expand Down
4 changes: 2 additions & 2 deletions chrome/android/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,7 @@ shared_library("chrome") {
"../browser/android/chrome_entry_point.cc",
]
deps = [
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
"//chrome:chrome_android_core",
]

Expand Down Expand Up @@ -773,7 +773,7 @@ shared_library("chrome_sync_shell") {
"../browser/android/chrome_sync_shell_main_delegate_initializer.cc",
]
deps = [
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
"//chrome:chrome_android_core",
"//components/sync",
"//components/sync:test_support_fake_server_android",
Expand Down
2 changes: 1 addition & 1 deletion chrome/chrome_watcher/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ shared_library("chrome_watcher") {
":client",
"//base",
"//base:base_static",
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
"//chrome/common",
"//chrome/install_static:secondary_module",
"//chrome_elf",
Expand Down
2 changes: 1 addition & 1 deletion chrome/installer/mini_installer/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ template("generate_mini_installer") {
":$archive_name",
":lib",
":version",
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
"//build/win:default_exe_manifest",
]
}
Expand Down
2 changes: 1 addition & 1 deletion chrome/installer/setup/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ if (is_win) {
deps = [
":lib",
":setup_exe_version",
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
"//build/win:default_exe_manifest",
"//chrome/install_static:install_static_util",
"//components/crash/content/app:app",
Expand Down
2 changes: 1 addition & 1 deletion chrome/installer/test/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ executable("alternate_version_generator") {
":alternate_version_generator_lib",
"//base",
"//base/test:test_support",
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
"//build/win:default_exe_manifest",
"//chrome/common:constants",
"//chrome/installer/util:with_rc_strings",
Expand Down
2 changes: 1 addition & 1 deletion chrome/test/chromedriver/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ executable("chromedriver") {

deps = [
":lib",
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
"//build/win:default_exe_manifest",
]
}
Expand Down
2 changes: 1 addition & 1 deletion chrome/tools/convert_dict/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ executable("convert_dict") {
":lib",
"//base",
"//base:i18n",
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
"//build/win:default_exe_manifest",
"//third_party/hunspell",
]
Expand Down
2 changes: 1 addition & 1 deletion chrome/tools/service_discovery_sniffer/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ executable("service_discovery_sniffer") {
deps = [
"//base",
"//base/test:test_support",
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
"//chrome/browser",
"//net",
]
Expand Down
14 changes: 7 additions & 7 deletions chrome_elf/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ shared_library("chrome_elf") {
":hook_util",
":nt_registry",
":security",
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
"//chrome/install_static:install_static_util",
"//chrome/install_static:primary_module",
]
Expand Down Expand Up @@ -110,7 +110,7 @@ executable("dll_hash_main") {
]
deps = [
":dll_hash",
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
"//build/win:default_exe_manifest",
]
}
Expand Down Expand Up @@ -258,7 +258,7 @@ shared_library("blacklist_test_main_dll") {
":blacklist",
":nt_registry",
"//base",
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
"//chrome/install_static:install_static_util",
]
}
Expand All @@ -270,7 +270,7 @@ loadable_module("blacklist_test_dll_1") {
"blacklist/test/blacklist_test_dll_1.def",
]
deps = [
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
]
}

Expand All @@ -281,7 +281,7 @@ loadable_module("blacklist_test_dll_2") {
"blacklist/test/blacklist_test_dll_2.def",
]
deps = [
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
]
}

Expand All @@ -296,7 +296,7 @@ loadable_module("blacklist_test_dll_3") {
"blacklist/test/blacklist_test_dll_3.cc",
]
deps = [
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
]
}

Expand All @@ -307,6 +307,6 @@ shared_library("hook_util_test_dll") {
"hook_util/test/hook_util_test_dll.h",
]
deps = [
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
]
}
2 changes: 1 addition & 1 deletion chromecast/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ executable("cast_shell") {
deps = [
":cast_shell_lib",
":chromecast_locales_pak",
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
"//chromecast/app",
"//content/public/app:both",
]
Expand Down
2 changes: 1 addition & 1 deletion components/cronet/ios/cronet_consumer/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ios_app_bundle("cronet_consumer") {

# All shared libraries must have the sanitizer deps to properly link in
# asan mode (this target will be empty in other cases).
"//build/config/sanitizers:deps",
"//build/config:exe_and_shlib_deps",
]

sources = [
Expand Down
Loading

0 comments on commit 84fa8b0

Please sign in to comment.