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