build/android/envsetup.sh - Issue 104563004: Fix non-goma android build after r238630

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 104563004: Fix non-goma android build after r238630 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix all other platforms (for realz this time) Created 7 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: build/android/envsetup.sh

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

index dda9eafac296b26463013aa79003ff1f4279fa7e..c7ee7570ad7cfdc6817a9ad3c57bd4beeff44ed3 100755

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

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

@@ -119,9 +119,7 @@ fi

# Source a bunch of helper functions

. ${CHROME_SRC}/build/android/adb_device_functions.sh

-ANDROID_GOMA_WRAPPER=""

if [[ -d $GOMA_DIR ]]; then

- ANDROID_GOMA_WRAPPER="$GOMA_DIR/gomacc"

num_cores="$(grep --count ^processor /proc/cpuinfo)"

# Goma is IO-ish you want more threads than you have cores.

let "goma_threads=num_cores*2"

@@ -131,7 +129,6 @@ if [[ -d $GOMA_DIR ]]; then

export GOMA_COMPILER_PROXY_THREADS

-export ANDROID_GOMA_WRAPPER

# Declare Android are cross compile.

export GYP_CROSSCOMPILE=1

« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »