diff options
| author | Elliott Hughes <enh@google.com> | 2019-08-12 13:10:07 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-12 13:10:07 -0700 |
| commit | 759e7178a15dfd0455113c0c9fd2cab36f862695 (patch) | |
| tree | 664dd963372d4d25c8b48157f56fff61f051a130 | |
| parent | bbfa151c8f26d0e5f9e64065cdea28ea43305501 (diff) | |
| parent | 37aba7f4611369f38c7b74e74fc86f85cd47a9a7 (diff) | |
| download | zlib-759e7178a15dfd0455113c0c9fd2cab36f862695.tar.gz | |
Merge "Track upstream change 796333a8." am: 07ce4ca205 am: ecf187a34a
am: 37aba7f461
Change-Id: Ia4f49d7d5c1422ac60ea7fc1dd16e900fbd3d431
| -rw-r--r-- | Android.bp | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -2,7 +2,8 @@ cc_defaults { name: "libz_defaults", cflags: [ - "-O3", + // Upstream chromium renames all the functions; we don't want that. + "-DCHROMIUM_ZLIB_NO_CHROMECONF", "-DHAVE_HIDDEN", "-DZLIB_CONST", "-Wall", |