android envsetup: Don't set mips_arch_variant.

Instead of the slightly rube-goldbergian approach of giving mips_arch_variant
the default value mips32r2 in common.gypi and then always overriding this with
mips32r1 in envsetup, just set mips_arch_variant to mips32r1 by default and
don't set it in envsetup.

I checked that the generated ninja file for base is identical before and after
this change, and that the mips flags change as expected when manually setting
mips_arch_variant to mips32r2. No behavior change.

BUG=330631
TBR=torne@chromium.org

Review URL: https://codereview.chromium.org/152233002

git-svn-id: http://src.chromium.org/svn/trunk/src/build@248409 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

android/envsetup_functions.sh

@@ -102,7 +102,6 @@ ${ANDROID_SDK_BUILD_TOOLS_VERSION}
       ;;
     "mips")
       DEFINES+=" target_arch=mipsel"
-      DEFINES+=" mips_arch_variant=mips32r1"
       ;;
     *)
       echo "TARGET_ARCH: ${TARGET_ARCH} is not supported." >& 2

common.gypi

@@ -1125,7 +1125,7 @@
     'linux_link_gsettings%': 0,
 
     # Default arch variant for MIPS.
-    'mips_arch_variant%': 'mips32r2',
+    'mips_arch_variant%': 'mips32r1',
 
     # Enable use of OpenMAX DL FFT routines.
     'use_openmax_dl_fft%': '<(use_openmax_dl_fft)',