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

build/toolchain/android/BUILD.gn

Index: build/toolchain/android/BUILD.gn
diff --git a/build/toolchain/android/BUILD.gn b/build/toolchain/android/BUILD.gn
index 749d28b60ad1164989c97b172426a611da69479b..313e6090e79ba1fd2c6a73050bd2c9ab04455ea2 100644
--- a/build/toolchain/android/BUILD.gn
+++ b/build/toolchain/android/BUILD.gn
@@ -3,8 +3,6 @@
 # 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
@@ -35,29 +33,20 @@ template("android_gcc_toolchain") {
     # 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"