Bug 1550022 - Include nssutil3 in freebl Android builds. r=jcj,KevinJacobs
authorEdouard Oger <eoger@fastmail.com>
Wed, 15 May 2019 15:54:31 +0000
changeset 15121 d8c3be523da5fe81f11ad6f7228b20d85b67a24d
parent 15120 abab71a3d216bb363d34c15d9df7e79ca7a5f56b
child 15122 b9bfa1d564f2f88d979d804f29b3bb0c555d3581
push id3360
push userjjones@mozilla.com
push dateWed, 15 May 2019 16:01:47 +0000
reviewersjcj, KevinJacobs
bugs1550022
Bug 1550022 - Include nssutil3 in freebl Android builds. r=jcj,KevinJacobs Differential Revision: https://phabricator.services.mozilla.com/D30380
lib/freebl/freebl.gyp
--- a/lib/freebl/freebl.gyp
+++ b/lib/freebl/freebl.gyp
@@ -177,29 +177,30 @@
         'hw-acc-crypto',
       ],
       'conditions': [
         [ 'target_arch=="ia32" or target_arch=="x64"', {
           'dependencies': [
             'gcm-aes-x86_c_lib',
           ]
         }],
-        [ 'OS!="linux" and OS!="android"', {
+        [ 'OS!="linux"', {
           'conditions': [
             [ 'moz_fold_libs==0', {
               'dependencies': [
                 '<(DEPTH)/lib/util/util.gyp:nssutil3',
               ],
             }, {
               'libraries': [
                 '<(moz_folded_library_name)',
               ],
             }],
           ],
-        }, 'target_arch=="x64"', {
+        }],
+        [ '(OS=="linux" or OS=="android") and target_arch=="x64"', {
           'dependencies': [
             'intel-gcm-wrap_c_lib',
           ],
         }],
         [ 'OS=="win" and cc_is_clang==1', {
           'dependencies': [
             'intel-gcm-wrap_c_lib',
           ],