diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-02 06:44:16 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-02 06:44:16 +0000 |
| commit | c1b44778358c745d3dc82de742bcd7db2ec6dcfc (patch) | |
| tree | b61d5c92c8836200936f9e073213273917e17018 /build | |
| parent | 64879ed5af0f9eea1a2f6c68d08f317ddf33bc37 (diff) | |
| download | chromium_src-c1b44778358c745d3dc82de742bcd7db2ec6dcfc.zip chromium_src-c1b44778358c745d3dc82de742bcd7db2ec6dcfc.tar.gz chromium_src-c1b44778358c745d3dc82de742bcd7db2ec6dcfc.tar.bz2 | |
Replace make function back now that not using goma (removed in http://chromiumcodereview.appspot.com/9570042)
TBR=maruel@chromium.org
BUG=None
TEST=
Review URL: https://chromiumcodereview.appspot.com/9585002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124615 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rwxr-xr-x | build/android/buildbot_functions.sh | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/build/android/buildbot_functions.sh b/build/android/buildbot_functions.sh index f3d1f4a..9ad5d49 100755 --- a/build/android/buildbot_functions.sh +++ b/build/android/buildbot_functions.sh @@ -115,6 +115,29 @@ function bb_setup_goma_internal { export PATH=$GOMA_DIR:$PATH } +# Temporarily added back when goma disabled +function old_make { + # TODO(michaelbai): how to use ccache in NDK. + if [ -n "${USE_CCACHE}" ]; then + if [ -e "${PREBUILT_CCACHE_PATH}" ]; then + use_ccache_var="$PREBUILT_CCACHE_PATH " + else + use_ccache_var="" + fi + fi + # Only cross-compile if the build is being done either from Chromium's src/ + # directory, or through WebKit, in which case the WEBKIT_ANDROID_BUILD + # environment variable will be defined. WebKit uses a different directory. + if [ -f "$PWD/build/android/envsetup.sh" ] || + [ -n "${WEBKIT_ANDROID_BUILD}" ]; then + CC="${use_ccache_var}${CROSS_CC}" CXX="${use_ccache_var}${CROSS_CXX}" \ + LINK="${CROSS_LINK}" AR="${CROSS_AR}" RANLIB="${CROSS_RANLIB}" \ + command make $* + else + command make $* + fi +} + # $@: make args. # Use goma if possible; degrades to non-Goma if needed. function bb_goma_make { @@ -125,7 +148,7 @@ function bb_goma_make { # http://build.chromium.org/p/chromium/builders/Linux%20x64/builds/23995/steps/compile/logs/stdio # But not on Android trybots? # http://build.chromium.org/p/tryserver.chromium/builders/android/builds/2136/steps/Compile/logs/stdio - make -j${JOBS} "$@" + old_make -j${JOBS} "$@" return bb_setup_goma_internal |