Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 '../../../../native_client/build/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 |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 53 }], | 53 }], |
| 54 ['nexe_target!=""', { | 54 ['nexe_target!=""', { |
| 55 'variables': { | 55 'variables': { |
| 56 # Patch over the fact that untrusted.gypi doesn't define these in all | 56 # Patch over the fact that untrusted.gypi doesn't define these in all |
| 57 # cases. | 57 # cases. |
| 58 'enable_x86_64%': 0, | 58 'enable_x86_64%': 0, |
| 59 'enable_x86_32%': 0, | 59 'enable_x86_32%': 0, |
| 60 'enable_arm%': 0, | 60 'enable_arm%': 0, |
| 61 'include_dirs': [ | 61 'include_dirs': [ |
| 62 '<(DEPTH)', | 62 '<(DEPTH)', |
| 63 '<(DEPTH)/ppapi', | |
|
Mark Seaborn
2012/09/11 22:10:06
Surely the existing entry is enough to do (say) '#
Nick Bray (chromium)
2012/09/12 01:19:13
Removed.
| |
| 63 ], | 64 ], |
| 64 'link_flags': [ | 65 'link_flags': [ |
| 65 '-lppapi_cpp', | 66 '-lppapi_cpp', |
| 66 '-lppapi', | 67 '-lppapi', |
| 67 '-lpthread', | 68 '-lpthread', |
| 68 ], | 69 ], |
| 69 }, | 70 }, |
| 70 'target_conditions': [ | 71 'target_conditions': [ |
| 71 ['build_newlib==1', { | 72 ['build_newlib==1', { |
| 72 'actions': [ | 73 'actions': [ |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 138 # TODO(ncbray) handle arm case. We don't have ARM glibc yet. | 139 # TODO(ncbray) handle arm case. We don't have ARM glibc yet. |
| 139 ], | 140 ], |
| 140 }, | 141 }, |
| 141 ], | 142 ], |
| 142 }], | 143 }], |
| 143 ], | 144 ], |
| 144 }], | 145 }], |
| 145 ], | 146 ], |
| 146 }, | 147 }, |
| 147 } | 148 } |
| OLD | NEW |