Move goma/ccache logic to //build/toolchain/gcc_toolchain.gni

build/toolchain/android/BUILD.gn

 # Copyright 2013 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.
 
 import("//build/config/sysroot.gni")  # Imports android/config.gni.
-import("//build/toolchain/ccache.gni")
-import("//build/toolchain/goma.gni")
 import("//build/toolchain/gcc_toolchain.gni")
 
 # The Android GCC toolchains share most of the same parameters, so we have this
 # wrapper around gcc_toolchain to avoid duplication of logic.
 #
 # Parameters:
 #  - android_ndk_sysroot
 #      Sysroot for this architecture.
 #  - android_ndk_lib_dir
 #      Subdirectory inside of android_ndk_sysroot where libs go.
@@ skipping 10 matching lines @@
 
     libs_section_prefix = "$android_ndk_lib/crtbegin_dynamic.o"
     libs_section_postfix = "$android_ndk_lib/crtend_android.o"
 
     solink_libs_section_prefix = "$android_ndk_lib/crtbegin_so.o"
     solink_libs_section_postfix = "$android_ndk_lib/crtend_so.o"
 
     # The tools should be run relative to the build dir.
     tool_prefix = rebase_path(invoker.tool_prefix, root_build_dir)
 
-    if (use_goma) {
-      assert(!use_ccache, "Goma and ccache can't be used together.")
-      compiler_prefix = "$goma_dir/gomacc "
-    } else if (use_ccache) {
-      compiler_prefix = "ccache "
-    } else {
-      compiler_prefix = ""
-    }
-
     is_clang = invoker.is_clang
     if (is_clang) {
       prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin",
                            root_build_dir)
-      cc = "${compiler_prefix}$prefix/clang"
-      cxx = "${compiler_prefix}$prefix/clang++"
+      cc = "$prefix/clang"
+      cxx = "$prefix/clang++"
     } else {
-      cc = "${compiler_prefix}${tool_prefix}gcc"
-      cxx = "${compiler_prefix}${tool_prefix}g++"
+      cc = "${tool_prefix}gcc"
+      cxx = "${tool_prefix}g++"
     }
     ar = tool_prefix + "ar"
     ld = cxx
-    readelf = compiler_prefix + tool_prefix + "readelf"
-    nm = compiler_prefix + tool_prefix + "nm"
+    readelf = tool_prefix + "readelf"
+    nm = tool_prefix + "nm"
     strip = "${tool_prefix}strip"
 
     toolchain_os = "android"
     toolchain_cpu = invoker.toolchain_cpu
   }
 }
 
 template("android_gcc_toolchains_helper") {
   android_gcc_toolchain(target_name) {
     android_ndk_sysroot = invoker.android_ndk_sysroot
@@ skipping 51 matching lines @@
   toolchain_cpu = "aarch64"
 }
 
 android_gcc_toolchains_helper("mips64el") {
   android_ndk_sysroot = "$android_ndk_root/$mips64_android_sysroot_subdir"
   android_ndk_lib_dir = "usr/lib64"
 
   tool_prefix = "$mips64_android_toolchain_root/bin/mipsel-linux-android-"
   toolchain_cpu = "mipsel64el"
 }