diff options
| author | peter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-13 11:27:08 +0000 |
|---|---|---|
| committer | peter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-13 11:27:08 +0000 |
| commit | eecb70f89ce0302c169267beaefcdf7d63e45f65 (patch) | |
| tree | 2d23a31ad76a9fe3f03b55e103e564c3b5ec7159 /build/android/envsetup.sh | |
| parent | d86cbdea4093f8d8ba2b7626254d059b7bac834f (diff) | |
| download | chromium_src-eecb70f89ce0302c169267beaefcdf7d63e45f65.zip chromium_src-eecb70f89ce0302c169267beaefcdf7d63e45f65.tar.gz chromium_src-eecb70f89ce0302c169267beaefcdf7d63e45f65.tar.bz2 | |
Revert 151110 - Fix ninja build for Android after http://codereview.chromium.org/10836080/
This CL broke the WebKit Android build bot and EWS bots by exporting
CC and CXX, which caused the global make settings as defined in gyp to be
ignored.
Original review URL: https://chromiumcodereview.appspot.com/10836192
TBR=yfriedman@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10829296
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151251 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android/envsetup.sh')
| -rwxr-xr-x | build/android/envsetup.sh | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/build/android/envsetup.sh b/build/android/envsetup.sh index 5ef93a4..82370cc 100755 --- a/build/android/envsetup.sh +++ b/build/android/envsetup.sh @@ -95,13 +95,10 @@ if [[ -d $GOMA_DIR ]]; then fi export ANDROID_GOMA_WRAPPER -export CC=$(basename ${ANDROID_TOOLCHAIN}/*-gcc) -export CXX=$(basename ${ANDROID_TOOLCHAIN}/*-g++) -export LINK=$(basename ${ANDROID_TOOLCHAIN}/*-gcc) -export AR=$(basename ${ANDROID_TOOLCHAIN}/*-ar) -export CC_host=gcc -export CXX_host=g++ -export AR_host=ar +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() { |