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

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

Issue 1110723002: Split to SafeBrowsingDatabaseManager into Local* and Remote*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix mismerge Created 5 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 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("//build/config/crypto.gni") 5 import("//build/config/crypto.gni")
6 import("//build/config/features.gni") 6 import("//build/config/features.gni")
7 import("//build/config/ui.gni") 7 import("//build/config/ui.gni")
8 8
9 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which 9 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which
10 # produces a conflict for the "grit" template so we have to only include one. 10 # produces a conflict for the "grit" template so we have to only include one.
(...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 "//chrome/browser/safe_browsing:chunk_proto", 435 "//chrome/browser/safe_browsing:chunk_proto",
436 "//chrome/browser/safe_browsing:metadata_proto", 436 "//chrome/browser/safe_browsing:metadata_proto",
437 "//chrome/browser/safe_browsing:report_proto", 437 "//chrome/browser/safe_browsing:report_proto",
438 ] 438 ]
439 if (safe_browsing_mode == 1) { 439 if (safe_browsing_mode == 1) {
440 sources += 440 sources +=
441 rebase_path(gypi_values.chrome_browser_safe_browsing_full_sources, 441 rebase_path(gypi_values.chrome_browser_safe_browsing_full_sources,
442 ".", 442 ".",
443 "//chrome") 443 "//chrome")
444 deps += [ "//chrome/common/safe_browsing:proto" ] 444 deps += [ "//chrome/common/safe_browsing:proto" ]
445 } else if (safe_browsing_mode == 3) {
446 sources += rebase_path(
447 gypi_values.chrome_browser_safe_browsing_mobile_extended_sources,
448 ".",
449 "//chrome")
445 } 450 }
446 } 451 }
447 452
448 if (is_linux) { 453 if (is_linux) {
449 deps += [ 454 deps += [
450 "//device/media_transfer_protocol", 455 "//device/media_transfer_protocol",
451 "//device/udev_linux", 456 "//device/udev_linux",
452 ] 457 ]
453 } 458 }
454 if (is_linux && !is_chromeos) { 459 if (is_linux && !is_chromeos) {
(...skipping 674 matching lines...) Expand 10 before | Expand all | Expand 10 after
1129 ] 1134 ]
1130 } 1135 }
1131 1136
1132 if (enable_wifi_bootstrapping) { 1137 if (enable_wifi_bootstrapping) {
1133 sources += [ 1138 sources += [
1134 "local_discovery/wifi/mock_wifi_manager.cc", 1139 "local_discovery/wifi/mock_wifi_manager.cc",
1135 "local_discovery/wifi/mock_wifi_manager.h", 1140 "local_discovery/wifi/mock_wifi_manager.h",
1136 ] 1141 ]
1137 } 1142 }
1138 } 1143 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698