summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYongqin Liu <yongqin.liu@linaro.org>2015-07-09 12:59:52 +0800
committerYongqin Liu <yongqin.liu@linaro.org>2015-07-20 16:55:15 +0800
commit1026fe7651c98753f8fa25353e1485c98483ac23 (patch)
treedaa16312c190f8c5b9aaaa0dd1a282708c9d69a2
parent12063c1746d25b8d5b7dcb24dfbc30b502272347 (diff)
downloadandroid-patchsets-1026fe7651c98753f8fa25353e1485c98483ac23.tar.gz
LOLLIPOP-MLCR-PATCHSET: add changes for chromium using system zlib
Change-Id: Ifa8c04f3721cc4dbc05d40326518cbcbaea76f10 Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
-rwxr-xr-xLOLLIPOP-MLCR-PATCHSET8
1 files changed, 8 insertions, 0 deletions
diff --git a/LOLLIPOP-MLCR-PATCHSET b/LOLLIPOP-MLCR-PATCHSET
index d492c5a..5046aa6 100755
--- a/LOLLIPOP-MLCR-PATCHSET
+++ b/LOLLIPOP-MLCR-PATCHSET
@@ -94,3 +94,11 @@ apply --linaro external/chromium_org/third_party/openmax_dl 15882/1
apply --linaro external/chromium_org/third_party/ots 15883/1
apply --linaro external/chromium_org/third_party/WebKit 15884/1
apply --linaro external/chromium_org/third_party/webrtc 15885/1
+
+# changes to make chromium_org to use the system libz.so and libz_minizip.so
+apply --linaro frameworks/webview 15973/1
+apply --linaro external/zlib 15955/5
+apply --linaro external/chromium_org 15960/5
+apply --linaro external/chromium_org/third_party/ots 15957/2
+apply --linaro external/chromium_org/third_party/freetype 15958/1
+apply --linaro external/chromium_org/third_party/WebKit 15959/2