diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-12 09:34:10 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-12 09:34:10 +0000 |
| commit | ad9449f9d9ce5bf2334555facb972ff9617c8547 (patch) | |
| tree | 80951ba87664aaef68d8344eb989ed5e7f22cfbf /build | |
| parent | 82933a582d3d3f0360418f5908370a884ed394a8 (diff) | |
| download | chromium_src-ad9449f9d9ce5bf2334555facb972ff9617c8547.zip chromium_src-ad9449f9d9ce5bf2334555facb972ff9617c8547.tar.gz chromium_src-ad9449f9d9ce5bf2334555facb972ff9617c8547.tar.bz2 | |
Build src/crypto for PNaCl
The new crypto_nacl target builds crypto for PNaCl.
BUG=276739
Review URL: https://codereview.chromium.org/185233012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256485 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/build/common.gypi b/build/common.gypi index 353d276..7f5def0 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -2201,9 +2201,6 @@ ['use_libjpeg_turbo==1', { 'defines': ['USE_LIBJPEG_TURBO=1'], }], - ['use_nss==1', { - 'defines': ['USE_NSS=1'], - }], ['use_x11==1', { 'defines': ['USE_X11=1'], }], @@ -2357,11 +2354,6 @@ }], ], }], - ['use_openssl==1', { - 'defines': [ - 'USE_OPENSSL=1', - ], - }], ['enable_eglimage==1', { 'defines': [ 'ENABLE_EGLIMAGE=1', @@ -2513,6 +2505,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', { |