diff options
| author | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2015-05-17 00:34:45 +0200 |
|---|---|---|
| committer | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2015-05-17 00:34:45 +0200 |
| commit | 32ca80570689fbb1adb8a7a9a477f3e791938502 (patch) | |
| tree | 3b14512cddef9e9dec9aa13e11757f7a27480d36 | |
| parent | 897f05ac8e45036890cc2630e4189c8ea2c6549c (diff) | |
| download | update-externals-32ca80570689fbb1adb8a7a9a477f3e791938502.tar.gz | |
Try updating from latest linaro-upstream-* branch
This should reduce the chance of getting merge conflicts, given
a previous linaro-upstream-* branch is likely more current than
AOSP master.
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
| -rwxr-xr-x | giflib.sh | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -28,6 +28,12 @@ AOSPVER=$(grep GIFLIB_MAJOR gif_lib.h |cut -d' ' -f3).$(grep GIFLIB_MINOR gif_li if [ "$V" = "$AOSPVER" ]; then notice "giflib is up to date in AOSP master, copying its work" else + LATEST_LINARO=$(latest $(git branch -a |grep origin/linaro-upstream |sed -e 's,.*-,,')) + if [ -n "$LATEST_LINARO" ]; then + if [ "$(latest $LATEST_LINARO $AOSPVER)" != "$AOSPVER" ]; then + git checkout linaro-upstream-$LATEST_LINARO || git checkout -b linaro-upstream-$LATEST_LINARO origin/linaro-upstream-$LATEST_LINARO + fi + fi notice "Updating giflib to $V" rm -f Android.patch |