| 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 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 189 rebase_path(gypi_values.chrome_browser_google_sources, ".", "//chrome") | 189 rebase_path(gypi_values.chrome_browser_google_sources, ".", "//chrome") |
| 190 sources += | 190 sources += |
| 191 rebase_path(gypi_values.chrome_browser_history_sources, ".", "//chrome") | 191 rebase_path(gypi_values.chrome_browser_history_sources, ".", "//chrome") |
| 192 sources += | 192 sources += |
| 193 rebase_path(gypi_values.chrome_browser_metrics_sources, ".", "//chrome") | 193 rebase_path(gypi_values.chrome_browser_metrics_sources, ".", "//chrome") |
| 194 sources += | 194 sources += |
| 195 rebase_path(gypi_values.chrome_browser_net_sources, ".", "//chrome") | 195 rebase_path(gypi_values.chrome_browser_net_sources, ".", "//chrome") |
| 196 sources += rebase_path(gypi_values.chrome_browser_password_manager_sources, | 196 sources += rebase_path(gypi_values.chrome_browser_password_manager_sources, |
| 197 ".", | 197 ".", |
| 198 "//chrome") | 198 "//chrome") |
| 199 sources += rebase_path(gypi_values.chrome_browser_permissions_sources, |
| 200 ".", |
| 201 "//chrome") |
| 199 sources += rebase_path(gypi_values.chrome_browser_predictor_sources, | 202 sources += rebase_path(gypi_values.chrome_browser_predictor_sources, |
| 200 ".", | 203 ".", |
| 201 "//chrome") | 204 "//chrome") |
| 202 sources += | 205 sources += |
| 203 rebase_path(gypi_values.chrome_browser_pref_sources, ".", "//chrome") | 206 rebase_path(gypi_values.chrome_browser_pref_sources, ".", "//chrome") |
| 204 sources += rebase_path(gypi_values.chrome_browser_profiles_sources, | 207 sources += rebase_path(gypi_values.chrome_browser_profiles_sources, |
| 205 ".", | 208 ".", |
| 206 "//chrome") | 209 "//chrome") |
| 207 sources += rebase_path(gypi_values.chrome_browser_search_engines_sources, | 210 sources += rebase_path(gypi_values.chrome_browser_search_engines_sources, |
| 208 ".", | 211 ".", |
| (...skipping 897 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1106 ] | 1109 ] |
| 1107 } | 1110 } |
| 1108 | 1111 |
| 1109 if (enable_wifi_bootstrapping) { | 1112 if (enable_wifi_bootstrapping) { |
| 1110 sources += [ | 1113 sources += [ |
| 1111 "local_discovery/wifi/mock_wifi_manager.cc", | 1114 "local_discovery/wifi/mock_wifi_manager.cc", |
| 1112 "local_discovery/wifi/mock_wifi_manager.h", | 1115 "local_discovery/wifi/mock_wifi_manager.h", |
| 1113 ] | 1116 ] |
| 1114 } | 1117 } |
| 1115 } | 1118 } |
| OLD | NEW |