Build src/crypto for PNaCl

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 28e3389b76fe724be78b51b54f52bc61a5c1b274..7de47c430300f96ffe6a5279015a0f54fe283faf 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -2211,9 +2211,6 @@
       ['use_libjpeg_turbo==1', {
         'defines': ['USE_LIBJPEG_TURBO=1'],
       }],
-      ['use_nss==1', {
-        'defines': ['USE_NSS=1'],
-      }],
       ['use_x11==1', {
         'defines': ['USE_X11=1'],
       }],
@@ -2367,11 +2364,6 @@
           }],
         ],
       }],
-      ['use_openssl==1', {
-        'defines': [
-          'USE_OPENSSL=1',
-        ],
-      }],
       ['enable_eglimage==1', {
         'defines': [
           'ENABLE_EGLIMAGE=1',
@@ -2523,6 +2515,12 @@
       }],
     ],  # conditions for 'target_defaults'
     'target_conditions': [
+      ['<(use_openssl)==1 or >(nacl_untrusted_build)==1', {
+        'defines': ['USE_OPENSSL=1'],
+      }],
+      ['<(use_nss)==1 and >(nacl_untrusted_build)==0', {
+        'defines': ['USE_NSS=1'],
+      }],
       ['enable_wexit_time_destructors==1', {
         'conditions': [
           [ 'clang==1', {