diff options
| author | Ben Murdoch <benm@google.com> | 2014-11-06 12:50:09 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-11-06 12:50:09 +0000 |
| commit | 5b892326406927b709cdaf6c384d4ababf456332 (patch) | |
| tree | c2b36e6a80232b23731b9b3be8f5b7701382dfcb /build | |
| parent | 17d46637767dc9c540d984794ad6b5162e8c8c4f (diff) | |
| download | chromium_org-5b892326406927b709cdaf6c384d4ababf456332.tar.gz | |
Merge from Chromium at DEPS revision 39.0.2171.53
This commit was generated by merge_to_master.py.
Change-Id: Id583a0dc312e50e455eb8bd04f75c74304738c9d
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 2 | ||||
| -rw-r--r-- | build/util/LASTCHANGE | 2 | ||||
| -rw-r--r-- | build/util/LASTCHANGE.blink | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/build/all.gyp b/build/all.gyp index 4cafea2808..6603793fb7 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -143,7 +143,7 @@ '<(libjpeg_gyp_path):*', ], }], - ['OS=="mac" or OS=="ios" or OS=="win"', { + ['use_openssl==0 and (OS=="mac" or OS=="ios" or OS=="win")', { 'dependencies': [ '../third_party/nss/nss.gyp:*', ], diff --git a/build/util/LASTCHANGE b/build/util/LASTCHANGE index 69ef3a2acb..a9405a1519 100644 --- a/build/util/LASTCHANGE +++ b/build/util/LASTCHANGE @@ -1 +1 @@ -LASTCHANGE=5a29759aab0d +LASTCHANGE=e00002df3f34 diff --git a/build/util/LASTCHANGE.blink b/build/util/LASTCHANGE.blink index a1c9ac970d..bb237e76d6 100644 --- a/build/util/LASTCHANGE.blink +++ b/build/util/LASTCHANGE.blink @@ -1 +1 @@ -LASTCHANGE=184502 +LASTCHANGE=184833 |