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

Side by Side Diff: build/android/envsetup.sh

Issue 139263010: envsetup: Stop setting FLOCK. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/bash 1 #!/bin/bash
2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 # Sets up environment for building Chromium on Android. It can either be 6 # Sets up environment for building Chromium on Android. It can either be
7 # compiled with the Android tree or using the Android SDK/NDK. To build with 7 # compiled with the Android tree or using the Android SDK/NDK. To build with
8 # NDK/SDK: ". build/android/envsetup.sh". Environment variable 8 # NDK/SDK: ". build/android/envsetup.sh". Environment variable
9 # ANDROID_SDK_BUILD=1 will then be defined and used in the rest of the setup to 9 # ANDROID_SDK_BUILD=1 will then be defined and used in the rest of the setup to
10 # specifiy build type. 10 # specifiy build type.
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 135
136 # Performs a gyp_chromium run to convert gyp->Makefile for android code. 136 # Performs a gyp_chromium run to convert gyp->Makefile for android code.
137 android_gyp() { 137 android_gyp() {
138 # This is just a simple wrapper of gyp_chromium, please don't add anything 138 # This is just a simple wrapper of gyp_chromium, please don't add anything
139 # in this function. 139 # in this function.
140 echo "GYP_GENERATORS set to '$GYP_GENERATORS'" 140 echo "GYP_GENERATORS set to '$GYP_GENERATORS'"
141 ( 141 (
142 "${CHROME_SRC}/build/gyp_chromium" --depth="${CHROME_SRC}" --check "$@" 142 "${CHROME_SRC}/build/gyp_chromium" --depth="${CHROME_SRC}" --check "$@"
143 ) 143 )
144 } 144 }
145
146 # FLOCK needs to be null on system that has no flock
147 which flock > /dev/null || export FLOCK=
OLDNEW
« 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