| 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/chrome_build.gni") |
| 6 import("//build/config/crypto.gni") | 6 import("//build/config/crypto.gni") |
| 7 import("//build/config/features.gni") | 7 import("//build/config/features.gni") |
| 8 import("//build/config/ui.gni") | 8 import("//build/config/ui.gni") |
| 9 import("//build/split_static_library.gni") | 9 import("//build/split_static_library.gni") |
| 10 import("//chrome/common/features.gni") | 10 import("//chrome/common/features.gni") |
| (...skipping 1580 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1591 ] | 1591 ] |
| 1592 | 1592 |
| 1593 # Android does in-process PAC, so must link against V8 directly. Other | 1593 # Android does in-process PAC, so must link against V8 directly. Other |
| 1594 # platforms use OOP Mojo resolution. | 1594 # platforms use OOP Mojo resolution. |
| 1595 if (is_android) { | 1595 if (is_android) { |
| 1596 deps += [ | 1596 deps += [ |
| 1597 "//net:net_with_v8", | 1597 "//net:net_with_v8", |
| 1598 "//v8", | 1598 "//v8", |
| 1599 ] | 1599 ] |
| 1600 } else { | 1600 } else { |
| 1601 deps += [ "//net:net" ] | 1601 deps += [ |
| 1602 "//chrome/app/vector_icons", |
| 1603 "//net:net", |
| 1604 "//ui/vector_icons", |
| 1605 ] |
| 1602 } | 1606 } |
| 1603 | 1607 |
| 1604 if (is_chromeos && use_cras) { | 1608 if (is_chromeos && use_cras) { |
| 1605 defines += [ "USE_CRAS" ] | 1609 defines += [ "USE_CRAS" ] |
| 1606 } | 1610 } |
| 1607 | 1611 |
| 1608 if (toolkit_views) { | 1612 if (toolkit_views) { |
| 1609 deps += [ "//ui/views" ] | 1613 deps += [ "//ui/views" ] |
| 1610 } | 1614 } |
| 1611 | 1615 |
| (...skipping 2910 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4522 "media/pepper_cdm_test_constants.cc", | 4526 "media/pepper_cdm_test_constants.cc", |
| 4523 "media/pepper_cdm_test_constants.h", | 4527 "media/pepper_cdm_test_constants.h", |
| 4524 ] | 4528 ] |
| 4525 } | 4529 } |
| 4526 } | 4530 } |
| 4527 | 4531 |
| 4528 service_manifest("preferences_manifest") { | 4532 service_manifest("preferences_manifest") { |
| 4529 name = "preferences" | 4533 name = "preferences" |
| 4530 source = "prefs/preferences_manifest.json" | 4534 source = "prefs/preferences_manifest.json" |
| 4531 } | 4535 } |
| OLD | NEW |