diff options
| author | Yongqin Liu <yongqin.liu@linaro.org> | 2015-08-07 21:53:42 +0800 |
|---|---|---|
| committer | Yongqin Liu <yongqin.liu@linaro.org> | 2015-08-07 21:53:42 +0800 |
| commit | 86b93900108f96fbf6d52f5b1d4b79f7954686d4 (patch) | |
| tree | 12ad3cd8b359901840a5ec3a1ab7557e63cebf2b | |
| parent | f1a5715b2bed607eba8839222110a0d47e03ee66 (diff) | |
| download | android-patchsets-86b93900108f96fbf6d52f5b1d4b79f7954686d4.tar.gz | |
move chromium related changes from MLCR patchset to a separate one
so that we can build image without chromium related changes on using system
external projects instead of using projects in its own third_party
Change-Id: Icaa96dd644e57c5170d692d6bc7fbc69aeef0022
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
| -rwxr-xr-x | LOLLIPOP-CHROMIUM-PATCHSET | 38 | ||||
| -rwxr-xr-x | LOLLIPOP-MLCR-PATCHSET | 22 |
2 files changed, 38 insertions, 22 deletions
diff --git a/LOLLIPOP-CHROMIUM-PATCHSET b/LOLLIPOP-CHROMIUM-PATCHSET new file mode 100755 index 0000000..a9c69e1 --- /dev/null +++ b/LOLLIPOP-CHROMIUM-PATCHSET @@ -0,0 +1,38 @@ +#!/bin/sh + +. $(dirname $0)/functions + +PATCHES=0 +if [ -n "$1" ]; then + AOSP="$1" +else + AOSP="`pwd`" +fi + +if ! [ -d "$AOSP" ] && ! [ -d "$AOSP/bionic" ] && [ -d "$AOSP"/build ]; then + echo "This script must be run from the AOSP source directory" + echo "or with the AOSP source directory as its first parameter." + exit 1 +fi + +# changes to make chromium_org to use the system libjpeg.so +apply --linaro external/chromium_org 15874/1 +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/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/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 diff --git a/LOLLIPOP-MLCR-PATCHSET b/LOLLIPOP-MLCR-PATCHSET index c4babba..b895af3 100755 --- a/LOLLIPOP-MLCR-PATCHSET +++ b/LOLLIPOP-MLCR-PATCHSET @@ -80,25 +80,3 @@ apply --linaro bionic 15972/2 apply --linaro bionic 15845/3 apply --linaro external/elfutils 15844/2 apply --linaro external/linux-tools-perf 15843/2 - -# changes to make chromium_org to use the system libjpeg.so -apply --linaro external/chromium_org 15874/1 -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/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/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 |