| 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 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 178 "//chrome") | 178 "//chrome") |
| 179 sources += rebase_path(gypi_values.chrome_browser_bookmark_sources, | 179 sources += rebase_path(gypi_values.chrome_browser_bookmark_sources, |
| 180 ".", | 180 ".", |
| 181 "//chrome") | 181 "//chrome") |
| 182 sources += rebase_path(gypi_values.chrome_browser_browser_process_sources, | 182 sources += rebase_path(gypi_values.chrome_browser_browser_process_sources, |
| 183 ".", | 183 ".", |
| 184 "//chrome") | 184 "//chrome") |
| 185 sources += rebase_path(gypi_values.chrome_browser_content_settings_sources, | 185 sources += rebase_path(gypi_values.chrome_browser_content_settings_sources, |
| 186 ".", | 186 ".", |
| 187 "//chrome") | 187 "//chrome") |
| 188 sources += rebase_path(gypi_values.chrome_browser_engagement_sources, |
| 189 ".", |
| 190 "//chrome") |
| 188 sources += | 191 sources += |
| 189 rebase_path(gypi_values.chrome_browser_favicon_sources, ".", "//chrome") | 192 rebase_path(gypi_values.chrome_browser_favicon_sources, ".", "//chrome") |
| 190 sources += | 193 sources += |
| 191 rebase_path(gypi_values.chrome_browser_google_sources, ".", "//chrome") | 194 rebase_path(gypi_values.chrome_browser_google_sources, ".", "//chrome") |
| 192 sources += | 195 sources += |
| 193 rebase_path(gypi_values.chrome_browser_history_sources, ".", "//chrome") | 196 rebase_path(gypi_values.chrome_browser_history_sources, ".", "//chrome") |
| 194 sources += | 197 sources += |
| 195 rebase_path(gypi_values.chrome_browser_metrics_sources, ".", "//chrome") | 198 rebase_path(gypi_values.chrome_browser_metrics_sources, ".", "//chrome") |
| 196 sources += | 199 sources += |
| 197 rebase_path(gypi_values.chrome_browser_net_sources, ".", "//chrome") | 200 rebase_path(gypi_values.chrome_browser_net_sources, ".", "//chrome") |
| (...skipping 926 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1124 ] | 1127 ] |
| 1125 } | 1128 } |
| 1126 | 1129 |
| 1127 if (enable_wifi_bootstrapping) { | 1130 if (enable_wifi_bootstrapping) { |
| 1128 sources += [ | 1131 sources += [ |
| 1129 "local_discovery/wifi/mock_wifi_manager.cc", | 1132 "local_discovery/wifi/mock_wifi_manager.cc", |
| 1130 "local_discovery/wifi/mock_wifi_manager.h", | 1133 "local_discovery/wifi/mock_wifi_manager.h", |
| 1131 ] | 1134 ] |
| 1132 } | 1135 } |
| 1133 } | 1136 } |
| OLD | NEW |