Merge changes I18a21ea4,I2fecb008
* changes:
Upgrade 3.10 kernel images to c2b95821
build-kernel.sh: Use GCC 4.9 automatically for Mips64 build.
diff --git a/arm64/kernel-qemu b/arm64/kernel-qemu
index 40e7a15..26c6669 100755
--- a/arm64/kernel-qemu
+++ b/arm64/kernel-qemu
Binary files differ
diff --git a/build-kernel.sh b/build-kernel.sh
index a8a85aa..beb5984 100755
--- a/build-kernel.sh
+++ b/build-kernel.sh
@@ -168,6 +168,9 @@
# There is no GCC 4.7 toolchain to build AARCH64 binaries.
GCC_VERSION=4.8
fi
+ if [ "$ARCH" = "mips64" ]; then
+ GCC_VERSION=4.9
+ fi
echo "Autoconfig: --gcc-version=$GCC_VERSION"
fi
@@ -357,6 +360,7 @@
;;
esac
+ORG_ARCH=$ARCH
case $ARCH in
mips64)
# MIPS64 Kernel code base is under arch/mips
@@ -419,7 +423,7 @@
cat > $OUTPUT/README <<EOF
This directory contains kernel images to be used with the Android emulator
-program, for the $ARCH CPU architecture. It was built with the $PROGNAME
+program, for the $ORG_ARCH CPU architecture. It was built with the $PROGNAME
script. For more details, read:
\$AOSP/external/qemu/docs/ANDROID-KERNEL.TXT
diff --git a/mips64/kernel-qemu b/mips64/kernel-qemu
index c0eaf09..740decf 100755
--- a/mips64/kernel-qemu
+++ b/mips64/kernel-qemu
Binary files differ
