| Index: crypto/crypto_nacl.gyp
|
| diff --git a/net/net_nacl.gyp b/crypto/crypto_nacl.gyp
|
| similarity index 62%
|
| copy from net/net_nacl.gyp
|
| copy to crypto/crypto_nacl.gyp
|
| index 7ca48edcddb24d24b0a3ccd45bb898b4f1821783..445161091969bcef94d71b3f39a22a1174d3c11d 100644
|
| --- a/net/net_nacl.gyp
|
| +++ b/crypto/crypto_nacl.gyp
|
| @@ -8,36 +8,39 @@
|
| },
|
| 'includes': [
|
| '../native_client/build/untrusted.gypi',
|
| - 'net.gypi',
|
| + 'crypto.gypi',
|
| ],
|
| 'targets': [
|
| {
|
| - 'target_name': 'net_nacl',
|
| + 'target_name': 'crypto_nacl',
|
| 'type': 'none',
|
| 'variables': {
|
| 'nacl_untrusted_build': 1,
|
| - 'nlib_target': 'libnet_nacl.a',
|
| + 'nlib_target': 'libcrypto_nacl.a',
|
| 'build_glibc': 0,
|
| 'build_newlib': 0,
|
| 'build_pnacl_newlib': 1,
|
| },
|
| 'dependencies': [
|
| - '../crypto/crypto_nacl.gyp:crypto_nacl',
|
| + '../third_party/boringssl/boringssl_nacl.gyp:boringssl_nacl',
|
| '../native_client/tools.gyp:prep_toolchain',
|
| '../native_client_sdk/native_client_sdk_untrusted.gyp:nacl_io_untrusted',
|
| - '../third_party/boringssl/boringssl_nacl.gyp:boringssl_nacl',
|
| - '../url/url_nacl.gyp:url_nacl',
|
| - 'net.gyp:net_derived_sources',
|
| - 'net.gyp:net_resources',
|
| ],
|
| 'defines': [
|
| - 'NET_IMPLEMENTATION',
|
| - ],
|
| - 'pnacl_compile_flags': [
|
| - '-Wno-bind-to-temporary-copy',
|
| + 'CRYPTO_IMPLEMENTATION',
|
| ],
|
| 'sources': [
|
| - '<@(net_nacl_common_sources)',
|
| + '<@(crypto_sources)',
|
| + ],
|
| + 'sources/': [
|
| + ['exclude', '_nss\.(cc|h)$'],
|
| + ['exclude', '^(mock_)?apple_'],
|
| + ['exclude', '^capi_'],
|
| + ['exclude', '^cssm_'],
|
| + ['exclude', '^nss_'],
|
| + ['exclude', '^mac_'],
|
| + ['exclude', '^third_party/nss/'],
|
| + ['include', '^third_party/nss/sha512.cc'],
|
| ],
|
| },
|
| ],
|
|
|