diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-17 20:33:19 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-17 20:33:19 +0000 |
| commit | ab9ce6ea5f581e4bad374179b37ea265f7e4908c (patch) | |
| tree | 5b20f76c00f36bde3b61e3751ce03567acc42744 /crypto/BUILD.gn | |
| parent | 64e53aab78faa46eae5266b4760af32f0f8e3bf6 (diff) | |
| download | chromium_src-ab9ce6ea5f581e4bad374179b37ea265f7e4908c.zip chromium_src-ab9ce6ea5f581e4bad374179b37ea265f7e4908c.tar.gz chromium_src-ab9ce6ea5f581e4bad374179b37ea265f7e4908c.tar.bz2 | |
Work on Mac GN build.
This fixes a lot of minor mistakes (mostly missing/extra files and flags) for the Mac GN build.
I separated out some clang flags into a config for extra clang warnings. Several of the third party libraries needed to remove this.
Removes the use_nss flag and uses !use_openssl. This is a result of discussion with rsleevi.
Removes extra duplicate net build file from secondary tree.
ui/gesture_events seems to be getting compiled in GN with more strict warnings than in GYP. Rather than fix this, I fixed the warning in the gesture recognizer unit test. It was returning a const copy (the const is pointless when you're copying).
This also removes a bunch of old GYP integration stuff that was left in the GN build.
R=scottmg@chromium.org
Review URL: https://codereview.chromium.org/239543013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@264626 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/BUILD.gn')
| -rw-r--r-- | crypto/BUILD.gn | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/crypto/BUILD.gn b/crypto/BUILD.gn index 455169c..1f31f8b 100644 --- a/crypto/BUILD.gn +++ b/crypto/BUILD.gn @@ -106,17 +106,11 @@ component("crypto") { ] } - if (!is_linux) { + if (use_openssl || !is_linux) { sources -= [ "openpgp_symmetric_encryption.cc", "openpgp_symmetric_encryption.h", ] - if (use_nss) { # Removed for non-NSS in all cases below. - sources -= [ - "openpgp_symmetric_encryption.cc", - "openpgp_symmetric_encryption.h", - ] - } } if (!is_mac) { sources -= [ @@ -133,7 +127,8 @@ component("crypto") { ] } - if (!use_nss) { + if (use_openssl) { + # Remove NSS files when using OpenSSL sources -= [ "ec_private_key_nss.cc", "ec_signature_creator_nss.cc", @@ -153,8 +148,8 @@ component("crypto") { "third_party/nss/rsawrapr.c", "third_party/nss/secsign.cc", ] - } - if (!use_openssl) { + } else { + # Remove OpenSSL when using NSS. sources -= [ "ec_private_key_openssl.cc", "ec_signature_creator_openssl.cc", |