Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index d4a8ea2840b185fa1afa2007722ccacbd40bdc21..12b4ee4cd00384660c8452505c9af5e1e2228635 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -2192,9 +2192,6 @@ |
['use_libjpeg_turbo==1', { |
'defines': ['USE_LIBJPEG_TURBO=1'], |
}], |
- ['use_nss==1', { |
- 'defines': ['USE_NSS=1'], |
- }], |
['use_x11==1', { |
'defines': ['USE_X11=1'], |
}], |
@@ -2351,11 +2348,6 @@ |
}], |
], |
}], |
- ['use_openssl==1', { |
- 'defines': [ |
- 'USE_OPENSSL=1', |
- ], |
- }], |
['enable_eglimage==1', { |
'defines': [ |
'ENABLE_EGLIMAGE=1', |
@@ -2507,6 +2499,12 @@ |
}], |
], # conditions for 'target_defaults' |
'target_conditions': [ |
+ ['<(use_openssl)==1 or >(nacl_untrusted_build)==1', { |
+ 'defines': ['USE_OPENSSL=1'], |
Ryan Sleevi
2014/03/06 21:48:02
You will need to update DEPS for this - deps/third
Sergey Ulanov
2014/03/11 01:07:50
Done.
|
+ }], |
+ ['<(use_nss)==1 and >(nacl_untrusted_build)==0', { |
+ 'defines': ['USE_NSS=1'], |
+ }], |
['enable_wexit_time_destructors==1', { |
'conditions': [ |
[ 'clang==1', { |