| OLD | NEW |
| 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 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 # Defines the configuration of Goma. | 5 # Defines the configuration of Goma. |
| 6 # | 6 # |
| 7 # This is currently designed to match the GYP build exactly, so as not to break | 7 # This is currently designed to match the GYP build exactly, so as not to break |
| 8 # people during the transition. | 8 # people during the transition. |
| 9 # | 9 # |
| 10 # TODO(brettw) make Android work like normal Linux. It's silly that Android has | 10 # TODO(brettw) make Android work like normal Linux. It's silly that Android has |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 if (is_win) { | 35 if (is_win) { |
| 36 goma_dir = "c:\goma\goma-win" | 36 goma_dir = "c:\goma\goma-win" |
| 37 } else { | 37 } else { |
| 38 goma_dir = exec_script("get_default_posix_goma_dir.py", [], "value") | 38 goma_dir = exec_script("get_default_posix_goma_dir.py", [], "value") |
| 39 } | 39 } |
| 40 } | 40 } |
| 41 | 41 |
| 42 if (use_goma) { | 42 if (use_goma) { |
| 43 # Define the toolchain for the GYP build when using goma. | 43 # Define the toolchain for the GYP build when using goma. |
| 44 make_goma_global_settings = | 44 make_goma_global_settings = |
| 45 "'make_global_settings': [" + | |
| 46 "['CC_wrapper', '$goma_dir/gomacc']," + | 45 "['CC_wrapper', '$goma_dir/gomacc']," + |
| 47 "['CXX_wrapper', '$goma_dir/gomacc']," + | 46 "['CXX_wrapper', '$goma_dir/gomacc']," + |
| 48 "['CC.host_wrapper', '$goma_dir/gomacc']," + | 47 "['CC.host_wrapper', '$goma_dir/gomacc']," + |
| 49 "['CXX.host_wrapper', '$goma_dir/gomacc']," + | 48 "['CXX.host_wrapper', '$goma_dir/gomacc']," |
| 50 "]," | |
| 51 } | 49 } |
| OLD | NEW |