commit 8fc2b1eb2b00d0c4bc3ce2a93598d30056acaad3
author Andrew Hsieh <andrewhsieh@google.com> Tue May 12 14:46:23 2015 +0800
committer Andrew Hsieh <andrewhsieh@google.com> Tue May 12 14:59:33 2015 +0800
tree 6519f12d242f4463e88f6366179c0d5147721ab2
parent 0cddc41b203f69aeacd7ba5e61a446081296feab

Fix inconsistency in make-standalone-toolchain.sh

Fix to
1. abort when both --arch and --toolchain are specified but inconsistent
2. choose arm as advertized when none of --arch or --toolchain is specified
3. always echo when options are "auto-config"'d

BUG=21035291

Change-Id: I920e2dfa36ae7f4495d741a7eaa5143b45aa69a9

build/tools/make-standalone-toolchain.sh

diff --git a/build/tools/make-standalone-toolchain.sh b/build/tools/make-standalone-toolchain.sh
index 7d1be9e..39386ac 100755
--- a/build/tools/make-standalone-toolchain.sh
+++ b/build/tools/make-standalone-toolchain.sh
@@ -78,40 +78,47 @@
     exit 1
 fi
 
-# Check ARCH
-if [ -z "$ARCH" ]; then
+# Check TOOLCHAIN_NAME
+ARCH_BY_TOOLCHAIN_NAME=
+if [ -n "$TOOLCHAIN_NAME" ]; then
     case $TOOLCHAIN_NAME in
         arm-*)
-            ARCH=arm
+            ARCH_BY_TOOLCHAIN_NAME=arm
             ;;
         x86-*)
-            ARCH=x86
+            ARCH_BY_TOOLCHAIN_NAME=x86
             ;;
         mipsel-*)
-            ARCH=mips
+            ARCH_BY_TOOLCHAIN_NAME=mips
             ;;
         aarch64-*)
-            ARCH=arm64
+            ARCH_BY_TOOLCHAIN_NAME=arm64
             ;;
         x86_64-linux-android-*)
-            ARCH=x86_64
+            ARCH_BY_TOOLCHAIN_NAME=x86_64
             TOOLCHAIN_NAME=$(echo "$TOOLCHAIN_NAME" | sed -e 's/-linux-android//')
             echo "Auto-truncate: --toolchain=$TOOLCHAIN_NAME"
             ;;
         x86_64-*)
-            ARCH=x86_64
+            ARCH_BY_TOOLCHAIN_NAME=x86_64
             ;;
         mips64el-*)
-            ARCH=mips64
+            ARCH_BY_TOOLCHAIN_NAME=mips64
             ;;
         *)
-            ARCH=null
-            echo "Unable to auto-config arch from toolchain $TOOLCHAIN_NAME"
+            echo "Invalid toolchain $TOOLCHAIN_NAME"
             exit 1
             ;;
     esac
+fi
+# Check ARCH
+if [ -z "$ARCH" ]; then
+    ARCH=$ARCH_BY_TOOLCHAIN_NAME
+    if [ -z "$ARCH" ]; then
+        ARCH=arm
+    fi
     ARCH_INC=$ARCH
-    log "Auto-config: --arch=$ARCH"
+    echo "Auto-config: --arch=$ARCH"
 else
     ARCH_INC=$ARCH
     case $ARCH in
@@ -141,6 +148,10 @@
             ;;
     esac
 
+    if [ -n "$ARCH_BY_TOOLCHAIN_NAME" -a "$ARCH" != "$ARCH_BY_TOOLCHAIN_NAME" ]; then
+        echo "Conflict --arch $ARCH and --toolchain $TOOLCHAIN_NAME"
+        exit 1
+    fi
 fi
 
 if [ -z "$ABIS" ]; then
@@ -214,10 +225,10 @@
         *)
             dump "ERROR: Unsupported NDK architecture $ARCH!"
     esac
-    log "Auto-config: --platform=$PLATFORM"
+    echo "Auto-config: --platform=$PLATFORM"
 elif [ -z "$PLATFORM" ] ; then
     PLATFORM=android-9
-    log "Auto-config: --platform=$PLATFORM"
+    echo "Auto-config: --platform=$PLATFORM"
 fi
 
 if [ ! -d "$NDK_DIR/platforms/$PLATFORM" ] ; then
@@ -700,7 +711,7 @@
                 copy_stl_libs x86_64       "bits"                "bits"       "../lib64"           "lib64"
                 copy_stl_libs x86_64       "x32/bits"            "x32/bits"   "../libx32"          "libx32"
             else
-                copy_stl_libs "$ABI"
+                copy_stl_libs x86_64       ""                    ""           "../lib64"           "."
             fi
             ;;
         mips64)
@@ -711,7 +722,7 @@
                 copy_stl_libs mips64       "bits"                "bits"             "../lib64"     "lib64"
                 copy_stl_libs mips64       "mips64-r2/bits"      "mips64-r2/bits"   "../lib64r2"   "lib64r2"
             else
-                copy_stl_libs "$ABI"
+                copy_stl_libs mips64       ""                    ""                 "../lib64"     "."
             fi
             ;;
         mips|mips32r6)