diff options
| author | michaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-18 22:08:06 +0000 |
|---|---|---|
| committer | michaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-18 22:08:06 +0000 |
| commit | d0245a13c45c5542b51c4eb2c9958c19917e09a7 (patch) | |
| tree | e618fe039d733fa1f880dbd583eded8c0def8bf0 /build/android/envsetup.sh | |
| parent | 25320604c11e0313ef5663bff8553b2c9febc9f6 (diff) | |
| download | chromium_src-d0245a13c45c5542b51c4eb2c9958c19917e09a7.zip chromium_src-d0245a13c45c5542b51c4eb2c9958c19917e09a7.tar.gz chromium_src-d0245a13c45c5542b51c4eb2c9958c19917e09a7.tar.bz2 | |
Removed CXX_target for Android
Don't rely on compiler_version.py, we pass in the gcc_version for Android
Also revert the previous compiler_version.py change.
BUG=143889
Review URL: https://chromiumcodereview.appspot.com/11185059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162808 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android/envsetup.sh')
| -rwxr-xr-x | build/android/envsetup.sh | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/build/android/envsetup.sh b/build/android/envsetup.sh index f94ca65..e381ac5 100755 --- a/build/android/envsetup.sh +++ b/build/android/envsetup.sh @@ -107,24 +107,12 @@ export ANDROID_GOMA_WRAPPER # Declare Android are cross compile. export GYP_CROSSCOMPILE=1 -export CXX_target="${ANDROID_GOMA_WRAPPER} \ - $(echo -n ${ANDROID_TOOLCHAIN}/*-g++)" - # Performs a gyp_chromium run to convert gyp->Makefile for android code. android_gyp() { + # This is just a simple wrapper of gyp_chromium, please don't add anything + # in this function. echo "GYP_GENERATORS set to '$GYP_GENERATORS'" - # http://crbug.com/143889. - # In case we are doing a Clang build, we have to unset CC_target and - # CXX_target. Otherwise GYP ends up generating a gcc build (although we set - # 'clang' to 1). This behavior was introduced by - # 54d2f6fe6d8a7b9d9786bd1f8540df6b4f46b83f in GYP. ( - # Fork to avoid side effects on the user's environment variables. - if echo "$GYP_DEFINES" | grep -qE '(clang|asan)'; then - if echo "$CXX_target" | grep -q g++; then - unset CXX_target - fi - fi "${CHROME_SRC}/build/gyp_chromium" --depth="${CHROME_SRC}" --check "$@" ) } |