| 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 | 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 385 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 396 sources += rebase_path(gypi_values.chrome_browser_policy_disabled_sources, | 396 sources += rebase_path(gypi_values.chrome_browser_policy_disabled_sources, |
| 397 ".", | 397 ".", |
| 398 "//chrome") | 398 "//chrome") |
| 399 } | 399 } |
| 400 | 400 |
| 401 if (enable_plugins) { | 401 if (enable_plugins) { |
| 402 sources += | 402 sources += |
| 403 rebase_path(gypi_values.chrome_browser_plugins_sources, ".", "//chrome") | 403 rebase_path(gypi_values.chrome_browser_plugins_sources, ".", "//chrome") |
| 404 deps += [ | 404 deps += [ |
| 405 "//components/pdf/browser", | 405 "//components/pdf/browser", |
| 406 "//components/plugins/common", |
| 406 "//ppapi/proxy:ipc", | 407 "//ppapi/proxy:ipc", |
| 407 "//third_party/adobe/flash:flapper_version_h", | 408 "//third_party/adobe/flash:flapper_version_h", |
| 408 ] | 409 ] |
| 409 } | 410 } |
| 410 if (safe_browsing_mode != 0) { | 411 if (safe_browsing_mode != 0) { |
| 411 sources += | 412 sources += |
| 412 rebase_path(gypi_values.chrome_browser_safe_browsing_basic_sources, | 413 rebase_path(gypi_values.chrome_browser_safe_browsing_basic_sources, |
| 413 ".", | 414 ".", |
| 414 "//chrome") | 415 "//chrome") |
| 415 deps += [ | 416 deps += [ |
| (...skipping 690 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1106 ] | 1107 ] |
| 1107 } | 1108 } |
| 1108 | 1109 |
| 1109 if (enable_wifi_bootstrapping) { | 1110 if (enable_wifi_bootstrapping) { |
| 1110 sources += [ | 1111 sources += [ |
| 1111 "local_discovery/wifi/mock_wifi_manager.cc", | 1112 "local_discovery/wifi/mock_wifi_manager.cc", |
| 1112 "local_discovery/wifi/mock_wifi_manager.h", | 1113 "local_discovery/wifi/mock_wifi_manager.h", |
| 1113 ] | 1114 ] |
| 1114 } | 1115 } |
| 1115 } | 1116 } |
| OLD | NEW |