summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYongqin Liu <yongqin.liu@linaro.org>2015-08-13 21:56:01 +0800
committerYongqin Liu <yongqin.liu@linaro.org>2015-08-14 11:10:47 +0800
commit2bb530254023898e20200bb6a498f6e0f1da08d0 (patch)
tree2a5b17364cadcdf9261e4510a71753cf63c009e6
parent86b93900108f96fbf6d52f5b1d4b79f7954686d4 (diff)
downloadandroid-patchsets-2bb530254023898e20200bb6a498f6e0f1da08d0.tar.gz
LOLLIPOP-CHROMIUM-PATCHSET: add patch list for chromium using system libpng
Change-Id: I257d82c767dbb49481c260ec25c3fc831a7e846c Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
-rwxr-xr-xLOLLIPOP-CHROMIUM-PATCHSET17
1 files changed, 11 insertions, 6 deletions
diff --git a/LOLLIPOP-CHROMIUM-PATCHSET b/LOLLIPOP-CHROMIUM-PATCHSET
index a9c69e1..8d330ee 100755
--- a/LOLLIPOP-CHROMIUM-PATCHSET
+++ b/LOLLIPOP-CHROMIUM-PATCHSET
@@ -16,23 +16,28 @@ if ! [ -d "$AOSP" ] && ! [ -d "$AOSP/bionic" ] && [ -d "$AOSP"/build ]; then
fi
# changes to make chromium_org to use the system libjpeg.so
-apply --linaro external/chromium_org 15874/1
+apply --linaro external/chromium_org 15874/3
apply --linaro external/chromium_org/v8 15876/1
apply --linaro external/chromium_org/third_party/angle 15877/1
-apply --linaro external/chromium_org/third_party/freetype 15878/1
+apply --linaro external/chromium_org/third_party/freetype 16014/1
apply --linaro external/chromium_org/third_party/icu 15879/1
apply --linaro external/chromium_org/third_party/libsrtp 15880/1
apply --linaro external/chromium_org/third_party/libvpx 15886/1
apply --linaro external/chromium_org/third_party/libyuv 15881/1
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/WebKit 16017/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 15960/7
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
+apply --linaro external/chromium_org/third_party/freetype 16015/1
+apply --linaro external/chromium_org/third_party/WebKit 16018/1
+
+# changes to make chromium_org to use the system libpng.so
+apply --linaro external/chromium_org 16024/1
+apply --linaro external/chromium_org/third_party/freetype 16016/1
+apply --linaro external/chromium_org/third_party/WebKit 16019/1