OLD | NEW |
---|---|
1 # -*- python -*- | 1 # -*- python -*- |
2 # Copyright (c) 2011 The Native Client Authors. All rights reserved. | 2 # Copyright (c) 2012 The Native Client Authors. All rights reserved. |
3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
5 | 5 |
6 Import('env') | 6 Import('env') |
7 | 7 |
8 libppapi_stub = env.ComponentLibrary('libppapi_stub', [ | 8 libppapi_stub = env.NaClSdkLibrary( |
Roland McGrath
2012/05/21 20:35:45
It was an explicit choice not to build libppapi_st
Robert Muth (chromium)
2012/05/21 21:33:27
It wont be built unless env.Bit('pnacl_shared_newl
Roland McGrath
2012/05/21 22:08:26
That's not true. NaClSdkLibrary always affects --
robertm
2012/05/22 13:55:16
The keyword arg "no_shared_lib" was supposed to pr
| |
9 'ppapi_plugin_main.c', | 9 'libppapi_stub', |
10 'ppapi_plugin_start.c', | 10 ['ppapi_plugin_main.c', |
11 'plugin_main_irt.c', | 11 'ppapi_plugin_start.c', |
12 'thread_creator.c' | 12 'plugin_main_irt.c', |
13 ]) | 13 'thread_creator.c' |
14 ], | |
15 no_shared_lib=not env.Bit('pnacl_shared_newlib')) | |
14 env.AddLibraryToSdk(libppapi_stub) | 16 env.AddLibraryToSdk(libppapi_stub) |
15 | 17 |
16 env.AddObjectToSdk(['libppapi.a']) | 18 env.AddObjectToSdk(['libppapi.a']) |
17 if not env.Bit('nacl_disable_shared'): | 19 if not env.Bit('nacl_disable_shared'): |
18 env.AddObjectToSdk(['libppapi.so']) | 20 env.AddObjectToSdk(['libppapi.so']) |
19 if env.Bit('bitcode'): | 21 if env.Bit('bitcode'): |
20 pso = env.InstallAs('libppapi.pso', 'libppapi.so') | 22 pso = env.InstallAs('libppapi.pso', 'libppapi.so') |
21 env.AddObjectToSdk(pso) | 23 env.AddObjectToSdk(pso) |
OLD | NEW |