| OLD | NEW |
| 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 import("//components/nacl/nacl_defines.gni") | 8 import("//components/nacl/nacl_defines.gni") |
| 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 369 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 380 defines += [ "FULL_SAFE_BROWSING" ] | 380 defines += [ "FULL_SAFE_BROWSING" ] |
| 381 deps += [ | 381 deps += [ |
| 382 "//chrome/common/safe_browsing:proto", | 382 "//chrome/common/safe_browsing:proto", |
| 383 ] | 383 ] |
| 384 } else if (safe_browsing_mode == 2) { | 384 } else if (safe_browsing_mode == 2) { |
| 385 defines += [ "MOBILE_SAFE_BROWSING" ] | 385 defines += [ "MOBILE_SAFE_BROWSING" ] |
| 386 } | 386 } |
| 387 } | 387 } |
| 388 | 388 |
| 389 if (is_linux) { | 389 if (is_linux) { |
| 390 configs += [ "//build/config/linux:udev" ] | 390 deps += [ |
| 391 deps += [ "//device/media_transfer_protocol" ] | 391 "//device/media_transfer_protocol", |
| 392 "//device/udev_linux" |
| 393 ] |
| 392 } | 394 } |
| 393 if (is_linux && !is_chromeos) { | 395 if (is_linux && !is_chromeos) { |
| 394 deps += [ "//third_party/speech-dispatcher" ] | 396 deps += [ "//third_party/speech-dispatcher" ] |
| 395 } | 397 } |
| 396 | 398 |
| 397 if (is_chromeos) { | 399 if (is_chromeos) { |
| 398 sources += rebase_path(gypi_values.chrome_browser_chromeos_sources, | 400 sources += rebase_path(gypi_values.chrome_browser_chromeos_sources, |
| 399 ".", "//chrome") | 401 ".", "//chrome") |
| 400 deps += [ | 402 deps += [ |
| 401 "//chrome/browser/chromeos", | 403 "//chrome/browser/chromeos", |
| (...skipping 600 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1002 ] | 1004 ] |
| 1003 } | 1005 } |
| 1004 | 1006 |
| 1005 if (enable_wifi_bootstrapping) { | 1007 if (enable_wifi_bootstrapping) { |
| 1006 sources += [ | 1008 sources += [ |
| 1007 "local_discovery/wifi/mock_wifi_manager.cc", | 1009 "local_discovery/wifi/mock_wifi_manager.cc", |
| 1008 "local_discovery/wifi/mock_wifi_manager.h", | 1010 "local_discovery/wifi/mock_wifi_manager.h", |
| 1009 ] | 1011 ] |
| 1010 } | 1012 } |
| 1011 } | 1013 } |
| OLD | NEW |