| 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 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 }, | 8 }, |
| 9 'includes': [ | 9 'includes': [ |
| 10 '../native_client/build/untrusted.gypi', | 10 '../native_client/build/untrusted.gypi', |
| 11 'ppapi_ipc.gypi', | 11 'ppapi_ipc.gypi', |
| 12 ], | 12 ], |
| 13 'conditions': [ | 13 'conditions': [ |
| 14 ['disable_nacl==0 and disable_nacl_untrusted==0', { | 14 ['disable_nacl==0 and disable_nacl_untrusted==0', { |
| 15 'targets': [ | 15 'targets': [ |
| 16 { | 16 { |
| 17 'target_name': 'ppapi_ipc_untrusted', | 17 'target_name': 'ppapi_ipc_untrusted', |
| 18 'type': 'none', | 18 'type': 'none', |
| 19 'variables': { | 19 'variables': { |
| 20 'ppapi_ipc_target': 1, | 20 'ppapi_ipc_target': 1, |
| 21 'nacl_win64_target': 0, | 21 'nacl_win64_target': 0, |
| 22 'nacl_untrusted_build': 1, | 22 'nacl_untrusted_build': 1, |
| 23 'nlib_target': 'libppapi_ipc_untrusted.a', | 23 'nlib_target': 'libppapi_ipc_untrusted.a', |
| 24 'build_glibc': 0, | 24 'build_glibc': 0, |
| 25 'build_newlib': 1, | 25 'build_newlib': 1, |
| 26 'defines': [ |
| 27 # Enable threading for the untrusted side of the proxy. |
| 28 # TODO(bbudge) remove when this is the default. |
| 29 'ENABLE_PEPPER_THREADING', |
| 30 ], |
| 26 }, | 31 }, |
| 27 'include_dirs': [ | 32 'include_dirs': [ |
| 28 '..', | 33 '..', |
| 29 ], | 34 ], |
| 30 'dependencies': [ | 35 'dependencies': [ |
| 31 '../native_client/tools.gyp:prep_toolchain', | 36 '../native_client/tools.gyp:prep_toolchain', |
| 32 '../base/base_untrusted.gyp:base_untrusted', | 37 '../base/base_untrusted.gyp:base_untrusted', |
| 33 '../gpu/gpu_untrusted.gyp:gpu_ipc_untrusted', | 38 '../gpu/gpu_untrusted.gyp:gpu_ipc_untrusted', |
| 34 '../ipc/ipc_untrusted.gyp:ipc_untrusted', | 39 '../ipc/ipc_untrusted.gyp:ipc_untrusted', |
| 35 '../ppapi/ppapi_shared_untrusted.gyp:ppapi_shared_untrusted', | 40 '../ppapi/ppapi_shared_untrusted.gyp:ppapi_shared_untrusted', |
| 36 '../components/tracing_untrusted.gyp:tracing_untrusted', | 41 '../components/tracing_untrusted.gyp:tracing_untrusted', |
| 37 ], | 42 ], |
| 38 }, | 43 }, |
| 39 ], | 44 ], |
| 40 }], | 45 }], |
| 41 ], | 46 ], |
| 42 } | 47 } |
| OLD | NEW |