build/android/envsetup.sh - Issue 10827419: Don't rely on the Android toolchain being exported in the PATH for the {CC,CXX,LINK,AR}_target defi…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/android/envsetup.sh

Issue 10827419: Don't rely on the Android toolchain being exported in the PATH for the {CC,CXX,LINK,AR}_target defi… (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

Index: build/android/envsetup.sh

diff --git a/build/android/envsetup.sh b/build/android/envsetup.sh

index 82370ccee63ebefc9910e42cf277d31ad6fcef87..27e84276c661f1d34f6444f31b9af6c60a734061 100755

--- a/build/android/envsetup.sh

+++ b/build/android/envsetup.sh

@@ -95,10 +95,11 @@ if [[ -d $GOMA_DIR ]]; then

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_target="${ANDROID_GOMA_WRAPPER} $(echo -n ${ANDROID_TOOLCHAIN}/*-gcc)"

+export CXX_target="${ANDROID_GOMA_WRAPPER} \

+ $(echo -n ${ANDROID_TOOLCHAIN}/*-g++)"

+export LINK_target=$(echo -n ${ANDROID_TOOLCHAIN}/*-gcc)

+export AR_target=$(echo -n ${ANDROID_TOOLCHAIN}/*-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 »