android envsetup: Stop honoring --target-arch parameter.

android_webview/tools/gyp_webview

Index: android_webview/tools/gyp_webview
diff --git a/android_webview/tools/gyp_webview b/android_webview/tools/gyp_webview
index 880d8450c1129608dbe2409058cdabf580203521..e28a6e3b5443ba579e531009a7ed82dd673f74dc 100755
--- a/android_webview/tools/gyp_webview
+++ b/android_webview/tools/gyp_webview
@@ -21,26 +21,26 @@ FLAGS="-f android -Gdefault_target=All -Glimit_to_target_all=1 "\
 "${CHROME_SRC}/android_webview/all_webview.gyp"
 
 if [ "$PLATFORM" == "linux-arm" -o "$PLATFORM" == "all" ]; then
-  ( . $CHROME_SRC/build/android/envsetup.sh --target-arch=arm \
-    && android_gyp --suffix .linux-arm ${FLAGS} -Dhost_os=linux )
+  ( . $CHROME_SRC/build/android/envsetup.sh \
+    && android_gyp --suffix .linux-arm ${FLAGS} -Dtarget_arch=arm -Dhost_os=linux )
 fi
 if [ "$PLATFORM" == "linux-x86" -o "$PLATFORM" == "all" ]; then
-  ( . $CHROME_SRC/build/android/envsetup.sh --target-arch=x86 \
-    && android_gyp --suffix .linux-x86 ${FLAGS} -Dhost_os=linux )
+  ( . $CHROME_SRC/build/android/envsetup.sh \
+    && android_gyp --suffix .linux-x86 ${FLAGS} -Dtarget_arch=ia32 -Dhost_os=linux )
 fi
 if [ "$PLATFORM" == "linux-mips" -o "$PLATFORM" == "all" ]; then
-  ( . $CHROME_SRC/build/android/envsetup.sh --target-arch=mips \
-    && android_gyp --suffix .linux-mips ${FLAGS} -Dhost_os=linux )
+  ( . $CHROME_SRC/build/android/envsetup.sh \
+    && android_gyp --suffix .linux-mips ${FLAGS} -Dtarget_arch=mipsel -Dhost_os=linux )
 fi
 if [ "$PLATFORM" == "darwin-arm" -o "$PLATFORM" == "all" ]; then
   ( . $CHROME_SRC/build/android/envsetup.sh --target-arch=arm \
-    && android_gyp --suffix .darwin-arm ${FLAGS} -Dhost_os=mac )
+    && android_gyp --suffix .darwin-arm ${FLAGS} -Dtarget_arch=arm -Dhost_os=mac )
 fi
 if [ "$PLATFORM" == "darwin-x86" -o "$PLATFORM" == "all" ]; then
-  ( . $CHROME_SRC/build/android/envsetup.sh --target-arch=x86 \
-    && android_gyp --suffix .darwin-x86 ${FLAGS} -Dhost_os=mac )
+  ( . $CHROME_SRC/build/android/envsetup.sh \
+    && android_gyp --suffix .darwin-x86 ${FLAGS} -Dtarget_arch=ia32 -Dhost_os=mac )
 fi
 if [ "$PLATFORM" == "darwin-mips" -o "$PLATFORM" == "all" ]; then
-  ( . $CHROME_SRC/build/android/envsetup.sh --target-arch=mips \
-    && android_gyp --suffix .darwin-mips ${FLAGS} -Dhost_os=mac )
+  ( . $CHROME_SRC/build/android/envsetup.sh \
+    && android_gyp --suffix .darwin-mips ${FLAGS} -Dtarget_arch=mipsel -Dhost_os=mac )
 fi