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

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

Issue 12321125: [Android] Remove guard that envsetup is sourced. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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.
11 11
12 if [ "$_" == "$0" ]; then 12 # TODO(ilevy): Figure out the right check here. This breaks the webkit build as
13 echo "ERROR: envsetup must be sourced." 13 # is since it's sourced from another script:
14 exit 1 14 # http://build.webkit.org/builders/Chromium%20Android%20Release/builds/34681
15 fi 15 #if [ "$_" == "$0" ]; then
16 # echo "ERROR: envsetup must be sourced."
17 # exit 1
18 #fi
16 19
17 # Source functions script. The file is in the same directory as this script. 20 # Source functions script. The file is in the same directory as this script.
18 . "$(dirname $BASH_SOURCE)"/envsetup_functions.sh 21 . "$(dirname $BASH_SOURCE)"/envsetup_functions.sh
19 22
20 export ANDROID_SDK_BUILD=1 # Default to SDK build. 23 export ANDROID_SDK_BUILD=1 # Default to SDK build.
21 24
22 process_options "$@" 25 process_options "$@"
23 26
24 # When building WebView as part of Android we can't use the SDK. Other builds 27 # When building WebView as part of Android we can't use the SDK. Other builds
25 # default to using the SDK. 28 # default to using the SDK.
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 # This is just a simple wrapper of gyp_chromium, please don't add anything 158 # This is just a simple wrapper of gyp_chromium, please don't add anything
156 # in this function. 159 # in this function.
157 echo "GYP_GENERATORS set to '$GYP_GENERATORS'" 160 echo "GYP_GENERATORS set to '$GYP_GENERATORS'"
158 ( 161 (
159 "${CHROME_SRC}/build/gyp_chromium" --depth="${CHROME_SRC}" --check "$@" 162 "${CHROME_SRC}/build/gyp_chromium" --depth="${CHROME_SRC}" --check "$@"
160 ) 163 )
161 } 164 }
162 165
163 # FLOCK needs to be null on system that has no flock 166 # FLOCK needs to be null on system that has no flock
164 which flock > /dev/null || export FLOCK= 167 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