| 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 { | 5 { |
| 6 'includes': [ | 6 'includes': [ |
| 7 '../native_client/build/untrusted.gypi', | 7 '../build/common_untrusted.gypi', |
| 8 ], | 8 ], |
| 9 'target_defaults': { | 9 'target_defaults': { |
| 10 # We need to override the variables in untrusted.gypi outside of a | 10 # We need to override the variables in untrusted.gypi outside of a |
| 11 # target_condition block because the target_condition block in | 11 # target_condition block because the target_condition block in |
| 12 # untrusted gypi is fully evaluated and interpolated before any of the | 12 # untrusted gypi is fully evaluated and interpolated before any of the |
| 13 # target_condition blocks in this file are expanded. This means that any | 13 # target_condition blocks in this file are expanded. This means that any |
| 14 # variables overriden inside a target_condition block in this file will not | 14 # variables overriden inside a target_condition block in this file will not |
| 15 # affect the values in untrusted.gypi. | 15 # affect the values in untrusted.gypi. |
| 16 'variables': { | 16 'variables': { |
| 17 'test_files': [], | 17 'test_files': [], |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 227 '>@(create_nmf_args_portable)' | 227 '>@(create_nmf_args_portable)' |
| 228 ], | 228 ], |
| 229 }, | 229 }, |
| 230 ], | 230 ], |
| 231 }], | 231 }], |
| 232 ], | 232 ], |
| 233 }], | 233 }], |
| 234 ], | 234 ], |
| 235 }, | 235 }, |
| 236 } | 236 } |
| OLD | NEW |