Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(182)

Issue 96923002: Add use_goma for GYP_DEFINES (Closed)

Created:
7 years ago by Yoshisato Yanagisawa
Modified:
7 years ago
Reviewers:
Nico, eae, boliu
CC:
chromium-reviews
Base URL:
https://src.chromium.org/chrome/trunk/src/
Visibility:
Public.

Description

Add use_goma for GYP_DEFINES If use_goma is specified in GYP_DEFINES, gomacc is automatically set as CC wrapper and CXX wrapper. It uses the default goma directory if the gomadir option is not given. No need to fix PATH when running ninja (or make). This is the revival of https://codereview.chromium.org/69293004/. In https://codereview.chromium.org/69293004/, I removed ANDROID_GOMA_WRAPPER code, which is actually used. This code supports both way of enabling goma for Android. You can set GOMA_DIR or you can set -D use_goma=1. Currently, this works well with ninja (default build system of chromium). It does not work well with make in some case (e.g. build on linux with make). Example 1 $ GYP_DEFINES="clang=1 use_goma=1" build/gyp_chromium (no need to set CC/CXX at this stage) build.ninja will have cc = ${HOME}/gomacc ../../third_party/llvm-build/Release+Asserts/bin/clang cxx = ${HOME}/gomacc ../../third_party/llvm-build/Release+Asserts/bin/clang++ The user can run ninja without setting PATH or so. $ ninja -C out/Release -j100 Example 2 $ GYP_DEFINES="use_goma=1 gomadir=/path/to/goma" build/gyp_chromium build.ninja will have cc = /path/to/goma/gomacc gcc cxx = /path/to/goma/gomacc g++ user can run ninja without setting PATH or so. $ ninja -C out/Release -j100 BUG=173686 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=237900 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=238630

Patch Set 1 #

Patch Set 2 : #

Patch Set 3 : #

Patch Set 4 : #

Patch Set 5 : #

Patch Set 6 : #

Total comments: 1
Unified diffs Side-by-side diffs Delta from patch set Stats (+60 lines, -22 lines) Patch
M build/common.gypi View 1 2 3 4 5 8 chunks +60 lines, -22 lines 1 comment Download

Messages

Total messages: 9 (0 generated)
Yoshisato Yanagisawa
Will you take a look at this change? And, will you check it won't make ...
7 years ago (2013-12-03 02:18:23 UTC) #1
eae
LGTM, lets see what the android bots thinks of it.
7 years ago (2013-12-03 22:05:12 UTC) #2
Yoshisato Yanagisawa
Let me check android_nexus4_perf_bisect fails by this change or not.
7 years ago (2013-12-04 01:59:38 UTC) #3
Yoshisato Yanagisawa
On 2013/12/04 01:59:38, yanagisawa wrote: > Let me check android_nexus4_perf_bisect fails by this change or ...
7 years ago (2013-12-04 02:36:57 UTC) #4
Yoshisato Yanagisawa
On 2013/12/04 02:36:57, yanagisawa wrote: > On 2013/12/04 01:59:38, yanagisawa wrote: > > Let me ...
7 years ago (2013-12-04 02:38:05 UTC) #5
Yoshisato Yanagisawa
Since Android bots looks not failing with this change, let me hit Commit button.
7 years ago (2013-12-04 05:08:14 UTC) #6
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/yyanagisawa@chromium.org/96923002/100001
7 years ago (2013-12-04 05:08:32 UTC) #7
commit-bot: I haz the power
Change committed as 238630
7 years ago (2013-12-04 07:32:43 UTC) #8
boliu
7 years ago (2013-12-04 17:11:39 UTC) #9
Message was sent while issue was closed.
One potential fix: https://codereview.chromium.org/104563004/

https://codereview.chromium.org/96923002/diff/100001/build/common.gypi
File build/common.gypi (right):

https://codereview.chromium.org/96923002/diff/100001/build/common.gypi#newcod...
build/common.gypi:112: 'android_goma_dir%': '<!(dirname
"${ANDROID_GOMA_WRAPPER}")',
This is breaking android builds that is *not* using goma. dirname returns . when
given an empty string, and gyp rules assume goma is available:

$ export ANDROID_GOMA_WRAPPER=""
$ dirname "${ANDROID_GOMA_WRAPPER}"
.

Powered by Google App Engine
This is Rietveld 408576698