diff options
| author | wangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-05 01:00:06 +0000 |
|---|---|---|
| committer | wangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-05 01:00:06 +0000 |
| commit | 2521bed416852a82b35321690ff9504b0b42c122 (patch) | |
| tree | 570fddd2f4d7fcb57cb361bc6c646a4735fa4999 /build | |
| parent | c68ee655740ce93d1269b766f650e6b3cda8a825 (diff) | |
| download | chromium_src-2521bed416852a82b35321690ff9504b0b42c122.zip chromium_src-2521bed416852a82b35321690ff9504b0b42c122.tar.gz chromium_src-2521bed416852a82b35321690ff9504b0b42c122.tar.bz2 | |
Revert build/common.gypi modified in r140431.
The change caused issues when running make with goma because the envirnoment
variable CXX_target etc. set in build/android/envsetup.sh are not full paths.
Should check with yfriedman@ why full paths are needed for ninja.
Revert build/common.gypi before the change.
build/android/envsetup.sh of r140431 is good.
Original review URL: https://chromiumcodereview.appspot.com/10511019/
TBR=jrg@chromium.org
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10531002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140454 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build/common.gypi b/build/common.gypi index 22511c2..b2a7693 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -3084,9 +3084,9 @@ # Hardcode the compiler names in the Makefile so that # it won't depend on the environment at make time. 'make_global_settings': [ - ['CC', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${CC_target}'], - ['CXX', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${CXX_target}'], - ['LINK', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${LINK_target}'], + ['CC', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*-gcc)'], + ['CXX', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*-g++)'], + ['LINK', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*-gcc)'], ['CC.host', '<!(which gcc)'], ['CXX.host', '<!(which g++)'], ['LINK.host', '<!(which g++)'], |