diff options
| author | wangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-04 23:39:58 +0000 |
|---|---|---|
| committer | wangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-04 23:39:58 +0000 |
| commit | c564ba125806be99271dbd6ce3a6f70f6170c6c1 (patch) | |
| tree | 49b6a92c035ac07cd167267cb899f70a1543a8ea /build | |
| parent | 09085fdb48ae2b3c094f0ee36f78172acf2b9f78 (diff) | |
| download | chromium_src-c564ba125806be99271dbd6ce3a6f70f6170c6c1.zip chromium_src-c564ba125806be99271dbd6ce3a6f70f6170c6c1.tar.gz chromium_src-c564ba125806be99271dbd6ce3a6f70f6170c6c1.tar.bz2 | |
Fix gyp on Android called by gclient or makefile regen
v8/build/common.gypi now uses environment variable CXX_target which is only
set in android_gyp, not set when gyp_chromium is called by gclient or automatic
makefile regeneration.
Now exports the environment variables needed by gyp generation.
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10511019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140431 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rwxr-xr-x | build/android/envsetup.sh | 21 | ||||
| -rw-r--r-- | build/common.gypi | 6 |
2 files changed, 14 insertions, 13 deletions
diff --git a/build/android/envsetup.sh b/build/android/envsetup.sh index 756c27b..05cd6d7 100755 --- a/build/android/envsetup.sh +++ b/build/android/envsetup.sh @@ -115,18 +115,19 @@ fi # Must be after CHROME_SRC is set. export PATH=$PATH:${CHROME_SRC}/build/android +ANDROID_GOMA_WRAPPER="" +if [[ -d $GOMA_DIR ]]; then + ANDROID_GOMA_WRAPPER="$GOMA_DIR/gomacc" +fi +export ANDROID_GOMA_WRAPPER + +export CC_target=$(basename ${ANDROID_TOOLCHAIN}/*-gcc) +export CXX_target=$(basename ${ANDROID_TOOLCHAIN}/*-g++) +export LINK_target=$(basename ${ANDROID_TOOLCHAIN}/*-gcc) +export AR_target=$(basename ${ANDROID_TOOLCHAIN}/*-ar) + # Performs a gyp_chromium run to convert gyp->Makefile for android code. android_gyp() { - ANDROID_GOMA_WRAPPER="" - if [[ -d $GOMA_DIR ]]; then - ANDROID_GOMA_WRAPPER="$GOMA_DIR/gomacc" - fi - # Ninja requires "*_target" for target builds. - ANDROID_GOMA_WRAPPER=${ANDROID_GOMA_WRAPPER} \ - CC_target=$(basename ${ANDROID_TOOLCHAIN}/*-gcc) \ - CXX_target=$(basename ${ANDROID_TOOLCHAIN}/*-g++) \ - LINK_target=$(basename ${ANDROID_TOOLCHAIN}/*-gcc) \ - AR_target=$(basename ${ANDROID_TOOLCHAIN}/*-ar) \ "${CHROME_SRC}/build/gyp_chromium" --depth="${CHROME_SRC}" "$@" } diff --git a/build/common.gypi b/build/common.gypi index b2a7693..22511c2 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} ${ANDROID_TOOLCHAIN}/*-gcc)'], - ['CXX', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*-g++)'], - ['LINK', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*-gcc)'], + ['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.host', '<!(which gcc)'], ['CXX.host', '<!(which g++)'], ['LINK.host', '<!(which g++)'], |