summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-16 20:30:45 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-16 20:30:45 +0000
commit3f56440dfc575f11e02e9966806d4f4ffeff6c0f (patch)
tree9722c094f375f062e00e7a2254cfcc9b930b71ad
parentc62d742fa43ee39dbb2e918cd4ea97f3c31edfc7 (diff)
downloadchromium_src-3f56440dfc575f11e02e9966806d4f4ffeff6c0f.zip
chromium_src-3f56440dfc575f11e02e9966806d4f4ffeff6c0f.tar.gz
chromium_src-3f56440dfc575f11e02e9966806d4f4ffeff6c0f.tar.bz2
envsetup: Stop setting FLOCK.
This was used by the make generator. The ninja generator uses ninja's built-in "pools" feature for limiting ld parallelism, so this is no longer needed. BUG=330631 R=torne@chromium.org Review URL: https://codereview.chromium.org/139263010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245304 0039d316-1c4b-4281-b951-d872f2087c98
-rwxr-xr-xbuild/android/envsetup.sh3
1 files changed, 0 insertions, 3 deletions
diff --git a/build/android/envsetup.sh b/build/android/envsetup.sh
index c7ee757..f7e5a69 100755
--- a/build/android/envsetup.sh
+++ b/build/android/envsetup.sh
@@ -142,6 +142,3 @@ android_gyp() {
"${CHROME_SRC}/build/gyp_chromium" --depth="${CHROME_SRC}" --check "$@"
)
}
-
-# FLOCK needs to be null on system that has no flock
-which flock > /dev/null || export FLOCK=