diff options
| author | Edouard Oger <eoger@fastmail.com> | 2019-05-15 15:54:31 +0000 |
|---|---|---|
| committer | Edouard Oger <eoger@fastmail.com> | 2019-05-15 15:54:31 +0000 |
| commit | 7b11ecaafa041d26ba167954f2c0a12dbd43079f (patch) | |
| tree | 84fdf47c64adac7dd0cb375d958c3c0b389c63ad /lib/freebl/freebl.gyp | |
| parent | 69b3d9eabb03a4d08843aa4cbbf30f7bdf032479 (diff) | |
| download | nss-hg-7b11ecaafa041d26ba167954f2c0a12dbd43079f.tar.gz | |
Bug 1550022 - Include nssutil3 in freebl Android builds. r=jcj,KevinJacobs
Differential Revision: https://phabricator.services.mozilla.com/D30380
Diffstat (limited to 'lib/freebl/freebl.gyp')
| -rw-r--r-- | lib/freebl/freebl.gyp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/freebl/freebl.gyp b/lib/freebl/freebl.gyp index ddb1d4582..472de30f8 100644 --- a/lib/freebl/freebl.gyp +++ b/lib/freebl/freebl.gyp @@ -182,7 +182,7 @@ 'gcm-aes-x86_c_lib', ] }], - [ 'OS!="linux" and OS!="android"', { + [ 'OS!="linux"', { 'conditions': [ [ 'moz_fold_libs==0', { 'dependencies': [ @@ -194,7 +194,8 @@ ], }], ], - }, 'target_arch=="x64"', { + }], + [ '(OS=="linux" or OS=="android") and target_arch=="x64"', { 'dependencies': [ 'intel-gcm-wrap_c_lib', ], |