| 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 591 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 602       "//components/web_contents_delegate_android", | 602       "//components/web_contents_delegate_android", | 
| 603       "//third_party/android_opengl/etc1", | 603       "//third_party/android_opengl/etc1", | 
| 604       "//third_party/libaddressinput:util", | 604       "//third_party/libaddressinput:util", | 
| 605     ] | 605     ] | 
| 606     deps -= [ | 606     deps -= [ | 
| 607       "//third_party/libaddressinput", | 607       "//third_party/libaddressinput", | 
| 608       "//components/storage_monitor", | 608       "//components/storage_monitor", | 
| 609       "//components/web_modal", | 609       "//components/web_modal", | 
| 610     ] | 610     ] | 
| 611     defines += [ "ENABLE_DATA_REDUCTION_PROXY_DEBUGGING" ] | 611     defines += [ "ENABLE_DATA_REDUCTION_PROXY_DEBUGGING" ] | 
|  | 612 | 
|  | 613     if (use_seccomp_bpf) { | 
|  | 614       defines += [ "USE_SECCOMP_BPF" ] | 
|  | 615     } | 
| 612   } | 616   } | 
| 613 | 617 | 
| 614   if (is_mac) { | 618   if (is_mac) { | 
| 615     deps += [ | 619     deps += [ | 
| 616       "//third_party/google_toolbox_for_mac", | 620       "//third_party/google_toolbox_for_mac", | 
| 617       "//third_party/mozilla", | 621       "//third_party/mozilla", | 
| 618     ] | 622     ] | 
| 619     libs += [ | 623     libs += [ | 
| 620       "Accelerate.framework", | 624       "Accelerate.framework", | 
| 621       "AddressBook.framework", | 625       "AddressBook.framework", | 
| (...skipping 478 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1100     ] | 1104     ] | 
| 1101   } | 1105   } | 
| 1102 | 1106 | 
| 1103   if (enable_wifi_bootstrapping) { | 1107   if (enable_wifi_bootstrapping) { | 
| 1104     sources += [ | 1108     sources += [ | 
| 1105       "local_discovery/wifi/mock_wifi_manager.cc", | 1109       "local_discovery/wifi/mock_wifi_manager.cc", | 
| 1106       "local_discovery/wifi/mock_wifi_manager.h", | 1110       "local_discovery/wifi/mock_wifi_manager.h", | 
| 1107     ] | 1111     ] | 
| 1108   } | 1112   } | 
| 1109 } | 1113 } | 
| OLD | NEW | 
|---|