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 # This file is named ppapi_ipc_proxy_untrusted.gyp instead of |
| 6 # ppapi_proxy_untrusted.gyp, because there is already a file with that name in |
| 7 # ppapi/native_client/src/shared/ppapi_proxy. This causes problems on Mac when |
| 8 # generating for XCode. TODO(dmichael): This file should probably be renamed to |
| 9 # ppapi_proxy_untrusted.gyp when we remove the SRPC NaCl proxy. |
5 { | 10 { |
6 'variables': { | 11 'variables': { |
7 'chromium_code': 1, | 12 'chromium_code': 1, |
8 }, | 13 }, |
9 'includes': [ | 14 'includes': [ |
10 '../build/common_untrusted.gypi', | 15 '../build/common_untrusted.gypi', |
11 'ppapi_proxy.gypi', | 16 'ppapi_proxy.gypi', |
12 ], | 17 ], |
13 'conditions': [ | 18 'conditions': [ |
14 ['disable_nacl==0 and disable_nacl_untrusted==0', { | 19 ['disable_nacl==0 and disable_nacl_untrusted==0', { |
(...skipping 19 matching lines...) Expand all Loading... |
34 '../native_client/tools.gyp:prep_toolchain', | 39 '../native_client/tools.gyp:prep_toolchain', |
35 '../base/base_untrusted.gyp:base_untrusted', | 40 '../base/base_untrusted.gyp:base_untrusted', |
36 '../gpu/command_buffer/command_buffer_untrusted.gyp:gles2_utils_untr
usted', | 41 '../gpu/command_buffer/command_buffer_untrusted.gyp:gles2_utils_untr
usted', |
37 '../gpu/gpu_untrusted.gyp:command_buffer_client_untrusted', | 42 '../gpu/gpu_untrusted.gyp:command_buffer_client_untrusted', |
38 '../gpu/gpu_untrusted.gyp:command_buffer_common_untrusted', | 43 '../gpu/gpu_untrusted.gyp:command_buffer_common_untrusted', |
39 '../gpu/gpu_untrusted.gyp:gles2_implementation_untrusted', | 44 '../gpu/gpu_untrusted.gyp:gles2_implementation_untrusted', |
40 '../gpu/gpu_untrusted.gyp:gles2_cmd_helper_untrusted', | 45 '../gpu/gpu_untrusted.gyp:gles2_cmd_helper_untrusted', |
41 '../gpu/gpu_untrusted.gyp:gpu_ipc_untrusted', | 46 '../gpu/gpu_untrusted.gyp:gpu_ipc_untrusted', |
42 '../ipc/ipc_untrusted.gyp:ipc_untrusted', | 47 '../ipc/ipc_untrusted.gyp:ipc_untrusted', |
43 '../ppapi/ppapi_shared_untrusted.gyp:ppapi_shared_untrusted', | 48 '../ppapi/ppapi_shared_untrusted.gyp:ppapi_shared_untrusted', |
| 49 '../ppapi/ppapi_ipc_untrusted.gyp:ppapi_ipc_untrusted', |
44 ], | 50 ], |
45 }, | 51 }, |
46 ], | 52 ], |
47 }], | 53 }], |
48 ], | 54 ], |
49 } | 55 } |
OLD | NEW |