diff options
| author | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-15 17:46:09 +0000 |
|---|---|---|
| committer | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-15 17:46:09 +0000 |
| commit | abe981f1b39e954f8cfef0e34017aa0ec436c2cf (patch) | |
| tree | 487e5a3ade9cecbdc06509d26354192514c2de59 | |
| parent | 14697dbadb0140b532d74a4ed77ceaf93652a2b3 (diff) | |
| download | chromium_src-abe981f1b39e954f8cfef0e34017aa0ec436c2cf.zip chromium_src-abe981f1b39e954f8cfef0e34017aa0ec436c2cf.tar.gz chromium_src-abe981f1b39e954f8cfef0e34017aa0ec436c2cf.tar.bz2 | |
Add crypto to the list of "all" projects.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6850032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81763 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/all.gyp | 7 | ||||
| -rw-r--r-- | crypto/rsa_private_key_nss_unittest.cc | 2 | ||||
| -rw-r--r-- | crypto/run_all_unittests.cc | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/build/all.gyp b/build/all.gyp index e9a1568..0894071 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -13,6 +13,7 @@ '../base/base.gyp:*', '../chrome/browser/sync/tools/sync_tools.gyp:*', '../chrome/chrome.gyp:*', + '../crypto/crypto.gyp:*', '../ui/ui.gyp:*', '../gpu/gpu.gyp:*', '../gpu/demos/demos.gyp:*', @@ -152,6 +153,7 @@ '../chrome/chrome.gyp:sync_unit_tests', '../chrome/chrome.gyp:ui_tests', '../chrome/chrome.gyp:unit_tests', + '../crypto/crypto.gyp:crypto_unittests', '../ui/ui.gyp:gfx_unittests', '../gpu/gpu.gyp:gpu_unittests', '../ipc/ipc.gyp:ipc_tests', @@ -209,6 +211,7 @@ '../chrome/chrome.gyp:sync_unit_tests', '../chrome/chrome.gyp:ui_tests', '../chrome/chrome.gyp:unit_tests', + '../crypto/crypto.gyp:crypto_unittests', '../ui/ui.gyp:gfx_unittests', '../gpu/gpu.gyp:gpu_unittests', '../ipc/ipc.gyp:ipc_tests', @@ -361,6 +364,7 @@ 'type': 'none', 'dependencies': [ '../base/base.gyp:base_unittests', + '../crypto/crypto.gyp:crypto_unittests', 'temp_gyp/googleurl.gyp:googleurl_unittests', '../net/net.gyp:net_unittests', '../ipc/ipc.gyp:ipc_tests', @@ -377,6 +381,7 @@ 'dependencies': [ '../app/app.gyp:app_unittests', '../base/base.gyp:base_unittests', + '../crypto/crypto.gyp:crypto_unittests', 'temp_gyp/googleurl.gyp:googleurl_unittests', '../ipc/ipc.gyp:ipc_tests', '../media/media.gyp:media_unittests', @@ -460,6 +465,7 @@ '../base/base.gyp:base_unittests', '../chrome/app/locales/locales.gyp:*', '../chrome/chrome.gyp:sync_unit_tests', + '../crypto/crypto.gyp:crypto_unittests', '../ipc/ipc.gyp:ipc_tests', '../jingle/jingle.gyp:jingle_unittests', '../media/media.gyp:media_unittests', @@ -533,6 +539,7 @@ '../chrome/chrome.gyp:ui_tests', '../chrome/chrome.gyp:unit_tests', '../chrome/chrome.gyp:url_fetch_test', + '../crypto/crypto.gyp:crypto_unittests', '../ui/ui.gyp:gfx_unittests', '../ipc/ipc.gyp:ipc_tests', '../jingle/jingle.gyp:jingle_unittests', diff --git a/crypto/rsa_private_key_nss_unittest.cc b/crypto/rsa_private_key_nss_unittest.cc index d3370fa..0ec801d 100644 --- a/crypto/rsa_private_key_nss_unittest.cc +++ b/crypto/rsa_private_key_nss_unittest.cc @@ -8,7 +8,7 @@ #include <pk11pub.h> #include "base/memory/scoped_ptr.h" -#include "base/nss_util.h" +#include "crypto/nss_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace crypto { diff --git a/crypto/run_all_unittests.cc b/crypto/run_all_unittests.cc index 6f37e66..9b6fc467 100644 --- a/crypto/run_all_unittests.cc +++ b/crypto/run_all_unittests.cc @@ -9,7 +9,7 @@ int main(int argc, char** argv) { #if defined(USE_NSS) // This is most likely not needed, but it basically replaces a similar call // that was performed on test_support_base. - TODO(rvargas) Bug 79359: remove this. + // TODO(rvargas) Bug 79359: remove this. crypto::EnsureNSSInit(); #endif // defined(USE_NSS) |