summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2024-01-09 14:40:43 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-01-09 14:40:43 +0000
commite12689d4778a0493dbf7069b0baee28376ecb37b (patch)
treead8b0e17b3a1d1ee5fe0e843ed76b3c833621ad6
parentaf4f8f086ba4c09c7d52f68fc2c2038df5c16a26 (diff)
parentf87a4c854e03963c1b0b24e344f42dd4b2a4ff7d (diff)
downloadzlib-e12689d4778a0493dbf7069b0baee28376ecb37b.tar.gz
Merge "Fix the problem of incremental OTA upgrade failure (zlib part)" into main
-rw-r--r--Android.bp5
1 files changed, 3 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index 800714c..4c349ea 100644
--- a/Android.bp
+++ b/Android.bp
@@ -215,8 +215,7 @@ cc_library {
}
// A more stable build of libz. Build configuration of this library should be
-// the same for different targets. This is only used by imgdiff.
-
+// the same for different targets. This is only used by OTA tools such as imgdiff and updater.
cc_library {
name: "libz_stable",
visibility: [
@@ -229,6 +228,8 @@ cc_library {
"-DHAVE_HIDDEN",
// We do support const, so turn that on.
"-DZLIB_CONST",
+ // Use the traditional Rabin-Karp rolling hash to match zlib DEFLATE output exactly.
+ "-DCHROMIUM_ZLIB_NO_CASTAGNOLI",
// Enable -O3 as per chromium
"-O3",
"-Wall",