diff options
| author | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-04 17:52:16 +0000 |
|---|---|---|
| committer | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-04 17:52:16 +0000 |
| commit | cdb2fb1a9905b0567c268a40ce907d09ed159d97 (patch) | |
| tree | 6762e51bd9953c39d45e4330bbedf7bd5d032836 /build | |
| parent | 840c8846c3cbd3ea4a6d0b5d08393b010396441a (diff) | |
| download | chromium_src-cdb2fb1a9905b0567c268a40ce907d09ed159d97.zip chromium_src-cdb2fb1a9905b0567c268a40ce907d09ed159d97.tar.gz chromium_src-cdb2fb1a9905b0567c268a40ce907d09ed159d97.tar.bz2 | |
Revert 238718 "Fix non-goma android build after r238630"
Broke gyp on chromeos bot (possibly others)
> Fix non-goma android build after r238630
>
> dirname outputs "." when given an empty argument, which gyp rules then
> interpret as goma being available.
>
> Remove ANDROID_GOMA_WRAPPER which is no longer used, and use GOMA_DIR
> directly for android build.
>
> BUG=
> NOTRY=true
>
> Review URL: https://codereview.chromium.org/104563004
TBR=boliu@chromium.org
Review URL: https://codereview.chromium.org/105123002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238719 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rwxr-xr-x | build/android/envsetup.sh | 3 | ||||
| -rw-r--r-- | build/common.gypi | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/build/android/envsetup.sh b/build/android/envsetup.sh index c7ee757..dda9eaf 100755 --- a/build/android/envsetup.sh +++ b/build/android/envsetup.sh @@ -119,7 +119,9 @@ fi # Source a bunch of helper functions . ${CHROME_SRC}/build/android/adb_device_functions.sh +ANDROID_GOMA_WRAPPER="" if [[ -d $GOMA_DIR ]]; then + ANDROID_GOMA_WRAPPER="$GOMA_DIR/gomacc" num_cores="$(grep --count ^processor /proc/cpuinfo)" # Goma is IO-ish you want more threads than you have cores. let "goma_threads=num_cores*2" @@ -129,6 +131,7 @@ if [[ -d $GOMA_DIR ]]; then export GOMA_COMPILER_PROXY_THREADS fi fi +export ANDROID_GOMA_WRAPPER # Declare Android are cross compile. export GYP_CROSSCOMPILE=1 diff --git a/build/common.gypi b/build/common.gypi index 994df15..8ba080e 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -109,7 +109,9 @@ }], ['OS=="android"', { - 'android_goma_dir%': '<!(echo "${GOMA_DIR}")', + 'android_goma_dir%': '<!(dirname "${ANDROID_GOMA_WRAPPER}")', + }, { + 'android_goma_dir%': '' }], ], }, |