diff options
| author | erikchen <erikchen@chromium.org> | 2015-07-27 18:03:58 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-28 01:04:49 +0000 |
| commit | 3e4cf54491803eb102c4887f1de5ccd088c612b1 (patch) | |
| tree | d588a2f8af3e5d6c1256085970e57c8cd4206e96 /ppapi | |
| parent | be23878b4cf35822c6f64827670abb5562eb776b (diff) | |
| download | chromium_src-3e4cf54491803eb102c4887f1de5ccd088c612b1.zip chromium_src-3e4cf54491803eb102c4887f1de5ccd088c612b1.tar.gz chromium_src-3e4cf54491803eb102c4887f1de5ccd088c612b1.tar.bz2 | |
Revert "Compile and link libcrypto_nacl for nacl targets."
I restructured the new ipc attachment broker code to not expose any crypto
symbols to irt targets, so the original CL is no longer needed.
> NaCl depends on libipc_nacl, which recently started depending on libcrypto_nacl.
> I failed to update the NaCl build files appropriately.
>
> BUG=466437
> Committed: https://crrev.com/675c4a0b28eb5b8e922153af2feb1ff68b635eb7
> Cr-Commit-Position: refs/heads/master@{#339558}
BUG=466437
TBR=agl@chromium.org, mseaborn@chromium.org
Review URL: https://codereview.chromium.org/1259103002
Cr-Commit-Position: refs/heads/master@{#340622}
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/native_client/BUILD.gn | 1 | ||||
| -rw-r--r-- | ppapi/native_client/native_client.gyp | 6 |
2 files changed, 0 insertions, 7 deletions
diff --git a/ppapi/native_client/BUILD.gn b/ppapi/native_client/BUILD.gn index 6e70287..488f44f 100644 --- a/ppapi/native_client/BUILD.gn +++ b/ppapi/native_client/BUILD.gn @@ -16,7 +16,6 @@ if (enable_nacl && enable_nacl_untrusted) { deps = [ "//base", "//components/tracing", - "//crypto", "//gpu/command_buffer/client", "//gpu/command_buffer/common", "//gpu/command_buffer/client:gles2_implementation", diff --git a/ppapi/native_client/native_client.gyp b/ppapi/native_client/native_client.gyp index 1ab6281..33bf6b5 100644 --- a/ppapi/native_client/native_client.gyp +++ b/ppapi/native_client/native_client.gyp @@ -144,7 +144,6 @@ '-ltracing_nacl', '-lgpu_ipc_nacl', '-lipc_nacl', - '-lcrypto_nacl', '-lbase_nacl', '-lshared_memory_support_nacl', '-lsrpc', @@ -186,7 +185,6 @@ '>(tc_lib_dir_irt64)/libgles2_cmd_helper_nacl.a', '>(tc_lib_dir_irt64)/libgles2_utils_nacl.a', '>(tc_lib_dir_irt64)/libipc_nacl.a', - '>(tc_lib_dir_irt64)/libcrypto_nacl.a', '>(tc_lib_dir_irt64)/libbase_nacl.a', '>(tc_lib_dir_irt64)/libirt_browser.a', '>(tc_lib_dir_irt64)/libpnacl_irt_shim_for_irt.a', @@ -209,7 +207,6 @@ '>(tc_lib_dir_irt32)/libgles2_cmd_helper_nacl.a', '>(tc_lib_dir_irt32)/libgles2_utils_nacl.a', '>(tc_lib_dir_irt32)/libipc_nacl.a', - '>(tc_lib_dir_irt32)/libcrypto_nacl.a', '>(tc_lib_dir_irt32)/libbase_nacl.a', '>(tc_lib_dir_irt32)/libirt_browser.a', '>(tc_lib_dir_irt32)/libpnacl_irt_shim_for_irt.a', @@ -234,7 +231,6 @@ '>(tc_lib_dir_irt_arm)/libgles2_cmd_helper_nacl.a', '>(tc_lib_dir_irt_arm)/libgles2_utils_nacl.a', '>(tc_lib_dir_irt_arm)/libipc_nacl.a', - '>(tc_lib_dir_irt_arm)/libcrypto_nacl.a', '>(tc_lib_dir_irt_arm)/libbase_nacl.a', '>(tc_lib_dir_irt_arm)/libirt_browser.a', '>(tc_lib_dir_irt_arm)/libpnacl_irt_shim_for_irt.a', @@ -259,7 +255,6 @@ '>(tc_lib_dir_irt_mips)/libgles2_cmd_helper_nacl.a', '>(tc_lib_dir_irt_mips)/libgles2_utils_nacl.a', '>(tc_lib_dir_irt_mips)/libipc_nacl.a', - '>(tc_lib_dir_irt_mips)/libcrypto_nacl.a', '>(tc_lib_dir_irt_mips)/libbase_nacl.a', '>(tc_lib_dir_irt_mips)/libirt_browser.a', '>(tc_lib_dir_irt_mips)/libpnacl_irt_shim_for_irt.a', @@ -285,7 +280,6 @@ '../../gpu/gpu_nacl.gyp:gpu_ipc_nacl', '../../components/tracing_nacl.gyp:tracing_nacl', '../../ipc/ipc_nacl.gyp:ipc_nacl', - '../../crypto/crypto_nacl.gyp:crypto_nacl', '../../base/base_nacl.gyp:base_nacl', '../../media/media_nacl.gyp:shared_memory_support_nacl', '../../mojo/mojo_nacl_untrusted.gyp:libmojo_irt', |