Chromium Code Reviews| Index: third_party/libwebm/libwebm_nacl.gyp |
| diff --git a/third_party/modp_b64/modp_b64_untrusted.gyp b/third_party/libwebm/libwebm_nacl.gyp |
| similarity index 50% |
| copy from third_party/modp_b64/modp_b64_untrusted.gyp |
| copy to third_party/libwebm/libwebm_nacl.gyp |
| index c51ff05be909b0604a5f440997205bb9c7e312c3..adec08f8551ce25f254020ae997e22cd412e2afd 100644 |
| --- a/third_party/modp_b64/modp_b64_untrusted.gyp |
| +++ b/third_party/libwebm/libwebm_nacl.gyp |
| @@ -1,30 +1,28 @@ |
| -# Copyright 2013 The Chromium Authors. All rights reserved. |
| +# Copyright 2014 The Chromium Authors. All rights reserved. |
| # Use of this source code is governed by a BSD-style license that can be |
| # found in the LICENSE file. |
| { |
| 'includes': [ |
| + 'libwebm.gypi', |
| '../../native_client/build/untrusted.gypi', |
| ], |
| 'targets': [ |
| { |
| - 'target_name': 'modp_b64_untrusted', |
| + '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 _
|
| 'type': 'none', |
| 'variables': { |
| - 'nlib_target': 'libmodp_b64_untrusted.a', |
| + 'nlib_target': 'libwebm_nacl.a', |
| 'build_glibc': 0, |
| - 'build_newlib': 1, |
| + 'build_newlib': 0, |
| 'build_pnacl_newlib': 1, |
| }, |
| 'dependencies': [ |
| - '<(DEPTH)/native_client/tools.gyp:prep_toolchain', |
| + '../../native_client/tools.gyp:prep_toolchain', |
| ], |
| - 'toolsets': ['host', 'target'], |
| 'sources': [ |
| - 'modp_b64.cc', |
| - 'modp_b64.h', |
| - 'modp_b64_data.h', |
| + '<@(libwebm_sources)', |
| ], |
| - }, |
| - ], |
| + }, # target libwebm_nacl |
| + ] |
| } |