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 is the "public" ppapi.gyp file, which must have dependencies on the | |
6 # redistributable portions of PPAPI only. This prevents circular dependencies | |
7 # in the .gyp files (since ppapi_internal depends on parts of Chrome). | |
8 | |
9 { | 5 { |
6 'variables': { | |
7 'chromium_code': 1, | |
8 }, | |
9 'includes': [ | |
10 '../native_client/build/untrusted.gypi', | |
bbudge
2012/06/14 02:45:10
I changed this (and others) to common.gypi to matc
| |
11 'ppapi_proxy.gypi', | |
12 ], | |
10 'conditions': [ | 13 'conditions': [ |
11 ['disable_nacl==0 and build_ppapi_ipc_proxy_untrusted==1', { | 14 ['disable_nacl_untrusted==0', { |
12 'includes': ['ppapi_proxy_untrusted.gypi'], | 15 'targets': [ |
16 { | |
17 'target_name': 'ppapi_proxy_untrusted', | |
18 'type': 'none', | |
19 'variables': { | |
20 'ppapi_proxy_target': 1, | |
21 'nacl_untrusted_build': 1, | |
22 'nlib_target': 'libppapi_proxy_untrusted.a', | |
23 'build_glibc': 0, | |
24 'build_newlib': 1, | |
25 }, | |
26 'dependencies': [ | |
27 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', | |
28 '<(DEPTH)/native_client/src/untrusted/pthread/pthread.gyp:pthread_li b', | |
Mark Seaborn
2012/06/13 20:27:37
I think this is wrong, because this is the user li
bbudge
2012/06/14 02:45:10
Done.
| |
29 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib' , | |
30 '../base/base_untrusted.gyp:base_untrusted', | |
31 '../ipc/ipc_untrusted.gyp:ipc_untrusted', | |
32 '../ppapi/ppapi_shared_untrusted.gyp:ppapi_shared_untrusted', | |
33 ], | |
34 }, | |
35 ], | |
13 }], | 36 }], |
14 ], | 37 ], |
15 'targets': [], | |
16 } | 38 } |
OLD | NEW |