bug 1162060 - add Socorro auth token to Android and B2G mozconfigs. r=mshal

--HG--
extra : rebase_source : 45ee7f81b60e7e0148ce1ee941614df5c445f04a

b2g/config/mozconfigs/common

@@ -14,3 +14,11 @@ if test -d $topsrcdir/../gcc/bin; then
     HOST_CXX="$topsrcdir/../gcc/bin/g++"
     ac_add_options --enable-stdcxx-compat
 fi
+
+# Allow overriding this from the environment, and don't
+# try to set it if it doesn't exist. As per above, this file is also
+# used for local builds, and we may need to override this for builds in
+# other environments.
+if test -z "$SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE" -a -f /builds/crash-stats-api.token; then
+  export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token
+fi

mobile/android/config/mozconfigs/common

@@ -39,6 +39,7 @@ ac_add_options --enable-warnings-as-errors
 
 ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-fennec-geoloc-api.key
 ac_add_options --with-adjust-sdk-keyfile=/builds/adjust-sdk.token
+export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1