Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(229)

Unified Diff: build/android/envsetup.sh

Issue 10836192: Fix ninja build for Android after http://codereview.chromium.org/10836080/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/envsetup.sh
diff --git a/build/android/envsetup.sh b/build/android/envsetup.sh
index 82370ccee63ebefc9910e42cf277d31ad6fcef87..5ef93a40566b5982ee23295de59d7e55cfa9adbf 100755
--- a/build/android/envsetup.sh
+++ b/build/android/envsetup.sh
@@ -95,10 +95,13 @@ if [[ -d $GOMA_DIR ]]; then
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)
+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
# Performs a gyp_chromium run to convert gyp->Makefile for android code.
android_gyp() {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698