diff options
| author | Narayan Kamath <narayan@google.com> | 2017-05-18 14:17:25 +0100 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2017-05-18 14:27:43 +0100 |
| commit | 20877b3d8f8c1c2eb639905e4732356e03f38ff7 (patch) | |
| tree | 51e5bd2195c3956cc412e1105428b7a203d3f53c /src/contrib/vstudio/vc11/zlib.rc | |
| parent | 86d60dc6f4a38aa2fd5d19fb707c920f8cd015eb (diff) | |
| download | zlib-20877b3d8f8c1c2eb639905e4732356e03f38ff7.tar.gz | |
Revert "Update zlib to 1.2.11"android-vts-8.0_r2android-vts-8.0_r1oreo-dev
This reverts commit fbe84be2fe4449e251193686bc704939e70e0d06.
This causes issues with server side infrastructure that makes invasive
assumptions about the nature of compressed zlib output at each compression
level which was broken by the upgrade from 1.2.8 -> 1.2.11. As a result, the
upgrade is being temporarily reverted to give the teams involved a little
more time to fix the issues on their end.
Bug: 38369364
Test: run cts -m CtsLibcoreTestCases
(cherry picked from commit 64c8fd52127407737beccba617e02eaf4a58ae7f)
Change-Id: I721461a384d763713fb9d07b43824859a661c6e9
Diffstat (limited to 'src/contrib/vstudio/vc11/zlib.rc')
| -rw-r--r-- | src/contrib/vstudio/vc11/zlib.rc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/contrib/vstudio/vc11/zlib.rc b/src/contrib/vstudio/vc11/zlib.rc index fee177a..73f6476 100644 --- a/src/contrib/vstudio/vc11/zlib.rc +++ b/src/contrib/vstudio/vc11/zlib.rc @@ -2,8 +2,8 @@ #define IDR_VERSION1 1
IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
- FILEVERSION 1, 2, 11, 0
- PRODUCTVERSION 1, 2, 11, 0
+ FILEVERSION 1,2,8,0
+ PRODUCTVERSION 1,2,8,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS 0
FILEOS VOS_DOS_WINDOWS32
@@ -17,12 +17,12 @@ BEGIN BEGIN
VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
- VALUE "FileVersion", "1.2.11\0"
+ VALUE "FileVersion", "1.2.8\0"
VALUE "InternalName", "zlib\0"
VALUE "OriginalFilename", "zlibwapi.dll\0"
VALUE "ProductName", "ZLib.DLL\0"
VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
- VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
+ VALUE "LegalCopyright", "(C) 1995-2013 Jean-loup Gailly & Mark Adler\0"
END
END
BLOCK "VarFileInfo"
|