aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-05-24 06:26:50 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-05-24 06:26:50 -0700
commit74416cef69ae7e514f5462da2b43d6d50cf01d2c (patch)
tree99a0b24dcf3cdd0bc8c18f67649e55177fac4bbc
parentf808ea33913102e45ab1d91197ac5e59b01ef158 (diff)
parent0621eeb599686e1d7dea3bf39ae8057bec574e0d (diff)
downloadexternal_qemu-74416cef69ae7e514f5462da2b43d6d50cf01d2c.zip
external_qemu-74416cef69ae7e514f5462da2b43d6d50cf01d2c.tar.gz
external_qemu-74416cef69ae7e514f5462da2b43d6d50cf01d2c.tar.bz2
Merge "Replace i686-android-linux with i686-linux-android"
-rwxr-xr-xdistrib/build-kernel.sh4
-rwxr-xr-xdistrib/kernel-toolchain/toolbox.sh2
2 files changed, 3 insertions, 3 deletions
diff --git a/distrib/build-kernel.sh b/distrib/build-kernel.sh
index 20d85c6..8c9f50a 100755
--- a/distrib/build-kernel.sh
+++ b/distrib/build-kernel.sh
@@ -131,8 +131,8 @@ else
CROSSPREFIX=arm-eabi-
;;
x86)
- CROSSTOOLCHAIN=i686-android-linux-4.4.3
- CROSSPREFIX=i686-android-linux-
+ CROSSTOOLCHAIN=i686-linux-android-4.6
+ CROSSPREFIX=i686-linux-android-
;;
*)
echo "ERROR: Unsupported architecture!"
diff --git a/distrib/kernel-toolchain/toolbox.sh b/distrib/kernel-toolchain/toolbox.sh
index 94e89b2..b9947e2 100755
--- a/distrib/kernel-toolchain/toolbox.sh
+++ b/distrib/kernel-toolchain/toolbox.sh
@@ -11,7 +11,7 @@
# REAL_CROSS_COMPILE must be defined, and its value must be one of the
# CROSS_COMPILE values that are supported by the Kernel build system
-# (e.g. "i686-android-linux-")
+# (e.g. "i686-linux-android-")
#
if [ -z "$REAL_CROSS_COMPILE" ]; then
echo "ERROR: The REAL_CROSS_COMPILE environment variable should be defined!"