Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Unified Diff: openssl.gyp

Issue 7948008: Using config/k8 as default config path in the taget_arch other than ia32. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/openssl/
Patch Set: '' Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: openssl.gyp
===================================================================
--- openssl.gyp (revision 101860)
+++ openssl.gyp (working copy)
@@ -584,27 +584,26 @@
# this at runtime with the SSL_CERT_DIR environment variable.
'OPENSSLDIR="/etc/ssl"',
],
+ 'variables': {
+ 'conditions': [
+ ['target_arch=="ia32"', {
+ 'openssl_config_path': 'config/piii',
+ }, {
+ 'openssl_config_path': 'config/k8',
+ }],
+ ],
+ },
}],
- ['OS=="linux" and target_arch=="ia32"', {
- 'variables': {
- 'openssl_config_path': 'config/piii',
- },
- }],
- ['OS=="linux" and target_arch=="x64"', {
- 'variables': {
- 'openssl_config_path': 'config/k8',
- },
- }],
['OS=="android"', {
- 'variables': {
- 'openssl_config_path': 'config/android',
- },
- 'sources/': [
- ['exclude', 'cast/.*$'],
- ['exclude', 'crypto/md2/.*$'],
- ['exclude', 'crypto/evp/e_camellia\.c'],
- ['exclude', 'crypto/evp/m_mdc2\.c'],
- ],
+ 'variables': {
+ 'openssl_config_path': 'config/android',
+ },
+ 'sources/': [
+ ['exclude', 'cast/.*$'],
+ ['exclude', 'crypto/md2/.*$'],
+ ['exclude', 'crypto/evp/e_camellia\.c'],
+ ['exclude', 'crypto/evp/m_mdc2\.c'],
+ ],
}],
],
'include_dirs': [
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698