Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 'includes': [ | 6 'includes': [ |
| 7 'libwebm.gypi', | |
| 7 '../../native_client/build/untrusted.gypi', | 8 '../../native_client/build/untrusted.gypi', |
| 8 ], | 9 ], |
| 9 'targets': [ | 10 'targets': [ |
| 10 { | 11 { |
| 11 'target_name': 'modp_b64_untrusted', | 12 'target_name': 'libwebm_nacl', |
|
Tom Finegan
2014/01/14 02:55:29
Shouldn't untrusted remain part of the name?
Sergey Ulanov
2014/01/14 18:19:07
I'm using _nacl for all new NaCl targets because _
| |
| 12 'type': 'none', | 13 'type': 'none', |
| 13 'variables': { | 14 'variables': { |
| 14 'nlib_target': 'libmodp_b64_untrusted.a', | 15 'nlib_target': 'libwebm_nacl.a', |
| 15 'build_glibc': 0, | 16 'build_glibc': 0, |
| 16 'build_newlib': 1, | 17 'build_newlib': 0, |
| 17 'build_pnacl_newlib': 1, | 18 'build_pnacl_newlib': 1, |
| 18 }, | 19 }, |
| 19 'dependencies': [ | 20 'dependencies': [ |
| 20 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', | 21 '../../native_client/tools.gyp:prep_toolchain', |
| 21 ], | 22 ], |
| 22 'toolsets': ['host', 'target'], | |
| 23 'sources': [ | 23 'sources': [ |
| 24 'modp_b64.cc', | 24 '<@(libwebm_sources)', |
| 25 'modp_b64.h', | |
| 26 'modp_b64_data.h', | |
| 27 ], | 25 ], |
| 28 }, | 26 }, # target libwebm_nacl |
| 29 ], | 27 ] |
| 30 } | 28 } |
| OLD | NEW |