| OLD | NEW |
| 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2009 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 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 }, | 8 }, |
| 9 'includes': [ | 9 'includes': [ |
| 10 '../build/common.gypi', | 10 '../build/common.gypi', |
| 11 ], | 11 ], |
| 12 'target_defaults': { | 12 'target_defaults': { |
| 13 'include_dirs': [ | 13 'include_dirs': [ |
| 14 '..', | 14 '..', |
| 15 '../..', | 15 '../..', |
| 16 '../../<(gtestdir)', | 16 '../../<(gtestdir)', |
| 17 '../../<(nacldir)', | 17 '../../<(nacldir)', |
| 18 ], | 18 ], |
| 19 # TODO(rlp): remove this after fixing signed / unsigned issues in |
| 20 # command buffer code and tests. |
| 21 'target_conditions': [ |
| 22 ['OS == "mac"', |
| 23 { |
| 24 'xcode_settings': { |
| 25 'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO' |
| 26 }, |
| 27 }, |
| 28 ], |
| 29 ], |
| 19 }, | 30 }, |
| 20 'targets': [ | 31 'targets': [ |
| 21 { | 32 { |
| 22 'target_name': 'command_buffer_common', | 33 'target_name': 'command_buffer_common', |
| 23 'type': 'static_library', | 34 'type': 'static_library', |
| 24 'dependencies': [ | 35 'dependencies': [ |
| 25 '../../native_client/src/shared/imc/imc.gyp:google_nacl_imc', | 36 '../../native_client/src/shared/imc/imc.gyp:google_nacl_imc', |
| 26 '../../native_client/src/shared/imc/imc.gyp:libgoogle_nacl_imc_c', | 37 '../../native_client/src/shared/imc/imc.gyp:libgoogle_nacl_imc_c', |
| 27 '../../native_client/src/shared/platform/platform.gyp:platform', | 38 '../../native_client/src/shared/platform/platform.gyp:platform', |
| 28 '../../native_client/src/trusted/desc/desc.gyp:nrd_xfer', | 39 '../../native_client/src/trusted/desc/desc.gyp:nrd_xfer', |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 'VCCLCompilerTool': { | 130 'VCCLCompilerTool': { |
| 120 'ForcedIncludeFiles': | 131 'ForcedIncludeFiles': |
| 121 'command_buffer/service/cross/precompile.h', | 132 'command_buffer/service/cross/precompile.h', |
| 122 }, | 133 }, |
| 123 }, | 134 }, |
| 124 }, | 135 }, |
| 125 ], | 136 ], |
| 126 ['OS == "mac"', | 137 ['OS == "mac"', |
| 127 { | 138 { |
| 128 'xcode_settings': { | 139 'xcode_settings': { |
| 129 'GCC_PREFIX_HEADER': 'command_buffer/service/cross/precompile.h', | 140 'GCC_PREFIX_HEADER': 'service/cross/precompile.h', |
| 130 }, | 141 }, |
| 131 }, | 142 }, |
| 132 ], | 143 ], |
| 133 ['OS == "linux"', | 144 ['OS == "linux"', |
| 134 { | 145 { |
| 135 'cflags': [ | 146 'cflags': [ |
| 136 '-include', | 147 '-include', |
| 137 'command_buffer/service/cross/precompile.h', | 148 'command_buffer/service/cross/precompile.h', |
| 138 ], | 149 ], |
| 139 }, | 150 }, |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 205 'sources': [ | 216 'sources': [ |
| 206 'service/cross/buffer_rpc_test.cc', | 217 'service/cross/buffer_rpc_test.cc', |
| 207 'service/cross/cmd_buffer_engine_test.cc', | 218 'service/cross/cmd_buffer_engine_test.cc', |
| 208 'service/cross/cmd_parser_test.cc', | 219 'service/cross/cmd_parser_test.cc', |
| 209 'service/cross/resource_test.cc', | 220 'service/cross/resource_test.cc', |
| 210 ], | 221 ], |
| 211 }, | 222 }, |
| 212 }, | 223 }, |
| 213 ], # 'targets' | 224 ], # 'targets' |
| 214 } | 225 } |
| OLD | NEW |