Chromium Code Reviews| 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 | 7 |
| 8 gypi_values = exec_script("//build/gypi_to_gn.py", | 8 gypi_values = exec_script("//build/gypi_to_gn.py", |
| 9 [ rebase_path("../chrome_utility.gypi") ], | 9 [ rebase_path("../chrome_utility.gypi") ], |
| 10 "scope", | 10 "scope", |
| (...skipping 30 matching lines...) Expand all Loading... | |
| 41 "//extensions/utility", | 41 "//extensions/utility", |
| 42 ] | 42 ] |
| 43 | 43 |
| 44 public_deps += [ "//chrome/common/extensions/api" ] | 44 public_deps += [ "//chrome/common/extensions/api" ] |
| 45 | 45 |
| 46 sources += | 46 sources += |
| 47 rebase_path(gypi_values.chrome_utility_extensions_sources, ".", "..") | 47 rebase_path(gypi_values.chrome_utility_extensions_sources, ".", "..") |
| 48 sources += | 48 sources += |
| 49 rebase_path(gypi_values.chrome_utility_shared_media_sources, ".", "..") | 49 rebase_path(gypi_values.chrome_utility_shared_media_sources, ".", "..") |
| 50 | 50 |
| 51 # Prevent wininet from loading in the renderer. http://crbug.com/460679 | |
| 52 if (is_win) { | |
| 53 ldflags = [ "/DELAYLOAD:wininet.dll" ] | |
|
scottmg
2015/02/25 18:04:56
I'm not sure why this doesn't work. I suspect beca
jschuh
2015/02/25 18:07:44
Excellent. I place the entire burden on you. :)
brettw
2015/02/25 23:35:05
See "gn help ldflags" for how this works and what
| |
| 54 } | |
| 55 | |
| 51 if (is_win || is_mac) { | 56 if (is_win || is_mac) { |
| 52 sources += | 57 sources += |
| 53 rebase_path(gypi_values.chrome_utility_win_mac_media_gallery_sources, | 58 rebase_path(gypi_values.chrome_utility_win_mac_media_gallery_sources, |
| 54 ".", | 59 ".", |
| 55 "..") | 60 "..") |
| 56 deps += [ "//components/wifi" ] | 61 deps += [ "//components/wifi" ] |
| 57 } else { | 62 } else { |
| 58 sources += [ "image_writer/image_writer_stub.cc" ] | 63 sources += [ "image_writer/image_writer_stub.cc" ] |
| 59 } | 64 } |
| 60 | 65 |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 100 sources -= [ | 105 sources -= [ |
| 101 "local_discovery/service_discovery_message_handler.cc", | 106 "local_discovery/service_discovery_message_handler.cc", |
| 102 "local_discovery/service_discovery_message_handler.h", | 107 "local_discovery/service_discovery_message_handler.h", |
| 103 ] | 108 ] |
| 104 } | 109 } |
| 105 | 110 |
| 106 if (safe_browsing_mode == 1) { | 111 if (safe_browsing_mode == 1) { |
| 107 defines += [ "FULL_SAFE_BROWSING" ] | 112 defines += [ "FULL_SAFE_BROWSING" ] |
| 108 } | 113 } |
| 109 } | 114 } |
| OLD | NEW |