diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-22 19:35:01 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-22 19:35:01 +0000 |
| commit | c33424e0e52cf25a7d3b4b99b1c0fddd19e277a3 (patch) | |
| tree | 2f18a99942ad3ac98230bf3b733d7ed496065583 /build/toolchain | |
| parent | 9a1270739f63447eff21c32e8a456a6054464799 (diff) | |
| download | chromium_src-c33424e0e52cf25a7d3b4b99b1c0fddd19e277a3.zip chromium_src-c33424e0e52cf25a7d3b4b99b1c0fddd19e277a3.tar.gz chromium_src-c33424e0e52cf25a7d3b4b99b1c0fddd19e277a3.tar.bz2 | |
Make the GN Android builds goma-aware.
R=brettw@chromium.org
BUG=394501
Review URL: https://codereview.chromium.org/409743002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284756 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/toolchain')
| -rw-r--r-- | build/toolchain/android/BUILD.gn | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/build/toolchain/android/BUILD.gn b/build/toolchain/android/BUILD.gn index dc3bfed..b483e21 100644 --- a/build/toolchain/android/BUILD.gn +++ b/build/toolchain/android/BUILD.gn @@ -32,8 +32,14 @@ template("android_gcc_toolchain") { # The tools should be run relative to the build dir. tool_prefix = rebase_path(invoker.tool_prefix, root_build_dir) - cc = tool_prefix + "gcc" - cxx = tool_prefix + "g++" + if (use_goma) { + goma_prefix = "$goma_dir/gomacc " + } else { + goma_prefix = "" + } + + cc = goma_prefix + tool_prefix + "gcc" + cxx = goma_prefix + tool_prefix + "g++" ar = tool_prefix + "ar" ld = cxx |