diff options
| author | Yongqin Liu <yongqin.liu@linaro.org> | 2015-08-16 06:45:40 +0000 |
|---|---|---|
| committer | Linaro Android Code Review <android-review@review.linaro.org> | 2015-08-16 06:45:40 +0000 |
| commit | 7ebaf0105cacf13e73df296d696bcc80c2b4df7b (patch) | |
| tree | b1778c63d904f2abc1fbb2cf1be5103d5cd4df27 | |
| parent | 282ce9617765a808c55b933d30a1599621d76e12 (diff) | |
| parent | 2bb530254023898e20200bb6a498f6e0f1da08d0 (diff) | |
| download | android-patchsets-7ebaf0105cacf13e73df296d696bcc80c2b4df7b.tar.gz | |
Merge "LOLLIPOP-CHROMIUM-PATCHSET: add patch list for chromium using system libpng"
| -rwxr-xr-x | LOLLIPOP-CHROMIUM-PATCHSET | 17 |
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 |