diff options
| author | erikchen <erikchen@chromium.org> | 2015-07-20 16:27:13 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-20 23:27:54 +0000 |
| commit | 675c4a0b28eb5b8e922153af2feb1ff68b635eb7 (patch) | |
| tree | bb51892f673f2713afad8d31cabeb3ca352e2c99 /ppapi/native_client | |
| parent | 17026b15b88ed133a2f641dacce69e6f443e964a (diff) | |
| download | chromium_src-675c4a0b28eb5b8e922153af2feb1ff68b635eb7.zip chromium_src-675c4a0b28eb5b8e922153af2feb1ff68b635eb7.tar.gz chromium_src-675c4a0b28eb5b8e922153af2feb1ff68b635eb7.tar.bz2 | |
Compile and link libcrypto_nacl for nacl targets.
NaCl depends on libipc_nacl, which recently started depending on libcrypto_nacl.
I failed to update the NaCl build files appropriately.
BUG=466437
Review URL: https://codereview.chromium.org/1235353003
Cr-Commit-Position: refs/heads/master@{#339558}
Diffstat (limited to 'ppapi/native_client')
| -rw-r--r-- | ppapi/native_client/BUILD.gn | 1 | ||||
| -rw-r--r-- | ppapi/native_client/native_client.gyp | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/ppapi/native_client/BUILD.gn b/ppapi/native_client/BUILD.gn index 488f44f..6e70287 100644 --- a/ppapi/native_client/BUILD.gn +++ b/ppapi/native_client/BUILD.gn @@ -16,6 +16,7 @@ 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 e767698..7f9e2b2 100644 --- a/ppapi/native_client/native_client.gyp +++ b/ppapi/native_client/native_client.gyp @@ -145,6 +145,7 @@ '-ltracing_nacl', '-lgpu_ipc_nacl', '-lipc_nacl', + '-lcrypto_nacl', '-lbase_nacl', '-lshared_memory_support_nacl', '-lsrpc', @@ -186,6 +187,7 @@ '>(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', @@ -208,6 +210,7 @@ '>(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', @@ -232,6 +235,7 @@ '>(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', @@ -256,6 +260,7 @@ '>(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', @@ -281,6 +286,7 @@ '../../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', |