Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

build/config/android/config.gni

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This file contains common system config stuff for the Android build.
 
 if (is_android) {
   has_chrome_android_internal =
       exec_script("//build/dir_exists.py",
                   [ rebase_path("//clank", root_build_dir) ],
@@ skipping 32 matching lines @@
     # This is a unique identifier for a given build. It's used for
     # identifying various build artifacts corresponding to a particular build of
     # chrome (e.g. where to find archived symbols).
     android_chrome_build_id = "\"\""
   }
 
   # Host stuff -----------------------------------------------------------------
 
   # Defines the name the Android build gives to the current host CPU
   # architecture, which is different than the names GN uses.
-  if (host_cpu == "x64") {
+  if (build_cpu_arch == "x64") {
     android_host_arch = "x86_64"
-  } else if (host_cpu == "x86") {
+  } else if (build_cpu_arch == "x86") {
     android_host_arch = "x86"
   } else {
     assert(false, "Need Android toolchain support for your build CPU arch.")
   }
 
   # Defines the name the Android build gives to the current host CPU
   # architecture, which is different than the names GN uses.
-  if (host_os == "linux") {
+  if (build_os == "linux") {
     android_host_os = "linux"
   } else {
     assert(false, "Need Android toolchain support for your build OS.")
   }
 
   # Directories and files ------------------------------------------------------
   #
   # We define may of the dirs strings here for each output architecture (rather
   # than just the current one) since these are needed by the Android toolchain
   # file to define toolchains for all possible targets in one pass.
@@ skipping 38 matching lines @@
   x86_android_toolchain_root = "$android_ndk_root/toolchains/x86-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch}"
   arm_android_toolchain_root = "$android_ndk_root/toolchains/arm-linux-androideabi-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch}"
   mips_android_toolchain_root = "$android_ndk_root/toolchains/mipsel-linux-android-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch}"
   x86_64_android_toolchain_root = "$android_ndk_root/toolchains/x86_64-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch}"
   arm64_android_toolchain_root = "$android_ndk_root/toolchains/aarch64-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch}"
   mips64_android_toolchain_root = "$android_ndk_root/toolchains/mips64el-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch}"
 
   # Location of libgcc. This is only needed for the current GN toolchain, so we
   # only need to define the current one, rather than one for every platform
   # like the toolchain roots.
-  if (current_cpu == "x86") {
+  if (cpu_arch == "x86") {
     android_prebuilt_arch = "android-x86"
     _binary_prefix = "i686-linux-android"
     android_toolchain_root = "$x86_android_toolchain_root"
     android_libgcc_file = "$android_toolchain_root/lib/gcc/i686-linux-android/${_android_toolchain_version}/libgcc.a"
-  } else if (current_cpu == "arm") {
+  } else if (cpu_arch == "arm") {
     android_prebuilt_arch = "android-arm"
     _binary_prefix = "arm-linux-androideabi"
     android_toolchain_root = "$arm_android_toolchain_root"
     android_libgcc_file = "$android_toolchain_root/lib/gcc/arm-linux-androideabi/${_android_toolchain_version}/libgcc.a"
-  } else if (current_cpu == "mipsel") {
+  } else if (cpu_arch == "mipsel") {
     android_prebuilt_arch = "android-mips"
     _binary_prefix = "mipsel-linux-android"
     android_toolchain_root = "$mips_android_toolchain_root"
     android_libgcc_file = "$android_toolchain_root/lib/gcc/mipsel-linux-android/${_android_toolchain_version}/libgcc.a"
-  } else if (current_cpu == "x64") {
+  } else if (cpu_arch == "x64") {
     android_prebuilt_arch = "android-x86_64"
     _binary_prefix = "x86_64-linux-android"
     android_toolchain_root = "$x86_64_android_toolchain_root"
     android_libgcc_file = "$android_toolchain_root/lib/gcc/x86_64-linux-android/${_android_toolchain_version}/libgcc.a"
-  } else if (current_cpu == "arm64") {
+  } else if (cpu_arch == "arm64") {
     android_prebuilt_arch = "android-arm64"
     _binary_prefix = "aarch64-linux-android"
     android_toolchain_root = "$arm64_android_toolchain_root"
     android_libgcc_file = "$android_toolchain_root/lib/gcc/aarch64-linux-android/${_android_toolchain_version}/libgcc.a"
-  } else if (current_cpu == "mips64el") {
+  } else if (cpu_arch == "mips64el") {
     android_prebuilt_arch = "android-mips64"
     _binary_prefix = "mips64el-linux-android"
     android_toolchain_root = "$mips64_android_toolchain_root"
     android_libgcc_file = "$android_toolchain_root/lib/gcc/mips64el-linux-android/${_android_toolchain_version}/libgcc.a"
   } else {
     assert(false, "Need android libgcc support for your target arch.")
   }
 
   android_tool_prefix = "$android_toolchain_root/bin/$_binary_prefix-"
   android_readelf = "${android_tool_prefix}readelf"
   android_objcopy = "${android_tool_prefix}objcopy"
   android_gdbserver =
       "$android_ndk_root/prebuilt/$android_prebuilt_arch/gdbserver/gdbserver"
 
   # stlport stuff --------------------------------------------------------------
 
   if (component_mode == "shared_library") {
     android_stlport_library = "stlport_shared"
   } else {
     android_stlport_library = "stlport_static"
   }
 
   # ABI ------------------------------------------------------------------------
 
-  if (current_cpu == "x86") {
+  if (cpu_arch == "x86") {
     android_app_abi = "x86"
-  } else if (current_cpu == "arm") {
+  } else if (cpu_arch == "arm") {
     import("//build/config/arm.gni")
     if (arm_version < 7) {
       android_app_abi = "armeabi"
     } else {
       android_app_abi = "armeabi-v7a"
     }
-  } else if (current_cpu == "mipsel") {
+  } else if (cpu_arch == "mipsel") {
     android_app_abi = "mips"
-  } else if (current_cpu == "x64") {
+  } else if (cpu_arch == "x64") {
     android_app_abi = "x86_64"
-  } else if (current_cpu == "arm64") {
+  } else if (cpu_arch == "arm64") {
     android_app_abi = "arm64-v8a"
-  } else if (current_cpu == "mips64el") {
+  } else if (cpu_arch == "mips64el") {
     android_app_abi = "mips64"
   } else {
-    assert(false, "Unknown Android ABI: " + current_cpu)
+    assert(false, "Unknown Android ABI: " + cpu_arch)
   }
 } else {
   if (!defined(is_android_webview_build)) {
     is_android_webview_build = false
   }
 }