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("//tools/grit/grit_rule.gni") | 5 import("//tools/grit/grit_rule.gni") |
| 6 | 6 |
| 7 gypi_values = exec_script( | 7 gypi_values = exec_script( |
| 8 "//build/gypi_to_gn.py", | 8 "//build/gypi_to_gn.py", |
| 9 [ rebase_path("../chrome_common.gypi") ], | 9 [ rebase_path("../chrome_common.gypi") ], |
| 10 "scope", | 10 "scope", |
| (...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 187 if (is_chromeos) { | 187 if (is_chromeos) { |
| 188 sources -= [ "chrome_version_info_linux.cc" ] | 188 sources -= [ "chrome_version_info_linux.cc" ] |
| 189 } | 189 } |
| 190 | 190 |
| 191 if (is_mac) { | 191 if (is_mac) { |
| 192 sources -= [ | 192 sources -= [ |
| 193 "chrome_version_info_posix.cc", | 193 "chrome_version_info_posix.cc", |
| 194 ] | 194 ] |
| 195 deps += [ | 195 deps += [ |
| 196 "//third_party/mach_override", | 196 "//third_party/mach_override", |
| 197 #'../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_ toolbox_for_mac', TODO(GYP) | 197 "//third_party/google_toolbox_for_mac", |
| 198 ] | |
| 199 include_dirs = [ | |
| 200 "//breakpad/src", | |
|
brettw
2014/07/23 18:04:16
What is this for? Can depending on breakpad do thi
jamesr
2014/07/23 19:57:29
I just copied what the gyp build does, but it's pr
brettw
2014/07/23 20:02:38
Try just removing it, I give 80% chance it works.
| |
| 198 ] | 201 ] |
| 199 } | 202 } |
| 200 | 203 |
| 201 if (enable_remoting) { | 204 if (enable_remoting) { |
| 202 #deps += [ '../remoting/remoting.gyp:remoting_client_plugin' ] TODO(GYP) | 205 #deps += [ '../remoting/remoting.gyp:remoting_client_plugin' ] TODO(GYP) |
| 203 } | 206 } |
| 204 if (!enable_plugins) { | 207 if (!enable_plugins) { |
| 205 sources -= [ "pepper_permission_util.cc" ] | 208 sources -= [ "pepper_permission_util.cc" ] |
| 206 } | 209 } |
| 207 if (!enable_webrtc) { | 210 if (!enable_webrtc) { |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 294 "//components/bookmarks/common", | 297 "//components/bookmarks/common", |
| 295 "//third_party/widevine/cdm:version_h", | 298 "//third_party/widevine/cdm:version_h", |
| 296 ] | 299 ] |
| 297 | 300 |
| 298 if (enable_nacl) { | 301 if (enable_nacl) { |
| 299 deps += [ | 302 deps += [ |
| 300 #'../components/nacl.gyp:nacl_switches', TODO(GYP) | 303 #'../components/nacl.gyp:nacl_switches', TODO(GYP) |
| 301 ] | 304 ] |
| 302 } | 305 } |
| 303 } | 306 } |
| OLD | NEW |