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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/build/android/envsetup.sh

Issue 105123002: Revert 238718 "Fix non-goma android build after r238630" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | trunk/src/build/common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/build/android/envsetup.sh
===================================================================
--- trunk/src/build/android/envsetup.sh (revision 238718)
+++ trunk/src/build/android/envsetup.sh (working copy)
@@ -119,7 +119,9 @@
# 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"
@@ -129,6 +131,7 @@
export GOMA_COMPILER_PROXY_THREADS
fi
fi
+export ANDROID_GOMA_WRAPPER
# Declare Android are cross compile.
export GYP_CROSSCOMPILE=1
« no previous file with comments | « no previous file | trunk/src/build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698