| 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/chrome_build.gni") | 
|     5 import("//build/config/crypto.gni") |     6 import("//build/config/crypto.gni") | 
|     6 import("//build/config/features.gni") |     7 import("//build/config/features.gni") | 
|     7 import("//build/config/ui.gni") |     8 import("//build/config/ui.gni") | 
|     8  |     9  | 
|     9 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which |    10 # //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. |    11 # produces a conflict for the "grit" template so we have to only include one. | 
|    11 if (is_android) { |    12 if (is_android) { | 
|    12   import("//build/config/android/rules.gni") |    13   import("//build/config/android/rules.gni") | 
|    13 } else { |    14 } else { | 
|    14   import("//tools/grit/grit_rule.gni") |    15   import("//tools/grit/grit_rule.gni") | 
| (...skipping 1115 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1130     ] |  1131     ] | 
|  1131   } |  1132   } | 
|  1132  |  1133  | 
|  1133   if (enable_wifi_bootstrapping) { |  1134   if (enable_wifi_bootstrapping) { | 
|  1134     sources += [ |  1135     sources += [ | 
|  1135       "local_discovery/wifi/mock_wifi_manager.cc", |  1136       "local_discovery/wifi/mock_wifi_manager.cc", | 
|  1136       "local_discovery/wifi/mock_wifi_manager.h", |  1137       "local_discovery/wifi/mock_wifi_manager.h", | 
|  1137     ] |  1138     ] | 
|  1138   } |  1139   } | 
|  1139 } |  1140 } | 
| OLD | NEW |