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/readme.txt | |
| 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/readme.txt')
| -rw-r--r-- | src/contrib/vstudio/readme.txt | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/src/contrib/vstudio/readme.txt b/src/contrib/vstudio/readme.txt index f67eae8..bfdcd9d 100644 --- a/src/contrib/vstudio/readme.txt +++ b/src/contrib/vstudio/readme.txt @@ -1,4 +1,4 @@ -Building instructions for the DLL versions of Zlib 1.2.11
+Building instructions for the DLL versions of Zlib 1.2.8
========================================================
This directory contains projects that build zlib and minizip using
@@ -16,7 +16,7 @@ More information can be found at this site. Build instructions for Visual Studio 2008 (32 bits or 64 bits)
--------------------------------------------------------------
-- Decompress current zlib, including all contrib/* files
+- Uncompress current zlib, including all contrib/* files
- Compile assembly code (with Visual Studio Command Prompt) by running:
bld_ml64.bat (in contrib\masmx64)
bld_ml32.bat (in contrib\masmx86)
@@ -25,24 +25,14 @@ Build instructions for Visual Studio 2008 (32 bits or 64 bits) Build instructions for Visual Studio 2010 (32 bits or 64 bits)
--------------------------------------------------------------
-- Decompress current zlib, including all contrib/* files
+- Uncompress current zlib, including all contrib/* files
- Open contrib\vstudio\vc10\zlibvc.sln with Microsoft Visual C++ 2010
Build instructions for Visual Studio 2012 (32 bits or 64 bits)
--------------------------------------------------------------
-- Decompress current zlib, including all contrib/* files
+- Uncompress current zlib, including all contrib/* files
- Open contrib\vstudio\vc11\zlibvc.sln with Microsoft Visual C++ 2012
-Build instructions for Visual Studio 2013 (32 bits or 64 bits)
---------------------------------------------------------------
-- Decompress current zlib, including all contrib/* files
-- Open contrib\vstudio\vc12\zlibvc.sln with Microsoft Visual C++ 2013
-
-Build instructions for Visual Studio 2015 (32 bits or 64 bits)
---------------------------------------------------------------
-- Decompress current zlib, including all contrib/* files
-- Open contrib\vstudio\vc14\zlibvc.sln with Microsoft Visual C++ 2015
-
Important
---------
@@ -73,6 +63,3 @@ Additional notes Gilles Vollant
info@winimage.com
-
-Visual Studio 2013 and 2015 Projects from Sean Hunt
-seandhunt_7@yahoo.com
|