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

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

Issue 12327031: Fix minor issue with build/android/envsetup.sh (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 2
3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 # Defines functions for envsetup.sh which sets up environment for building 7 # Defines functions for envsetup.sh which sets up environment for building
8 # Chromium on Android. The build can be either use the Android NDK/SDK or 8 # Chromium on Android. The build can be either use the Android NDK/SDK or
9 # android source tree. Each has a unique init function which calls functions 9 # android source tree. Each has a unique init function which calls functions
10 # prefixed with "common_" that is common for both environment setups. 10 # prefixed with "common_" that is common for both environment setups.
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 } 128 }
129 129
130 130
131 ################################################################################ 131 ################################################################################
132 # Exports common GYP variables based on variable DEFINES and CHROME_SRC. 132 # Exports common GYP variables based on variable DEFINES and CHROME_SRC.
133 ################################################################################ 133 ################################################################################
134 common_gyp_vars() { 134 common_gyp_vars() {
135 export GYP_DEFINES="${DEFINES}" 135 export GYP_DEFINES="${DEFINES}"
136 136
137 # Set GYP_GENERATORS to ninja if it's currently unset or null. 137 # Set GYP_GENERATORS to ninja if it's currently unset or null.
138 if [ -z $GYP_GENERATORS ]; then 138 if [ -z "$GYP_GENERATORS" ]; then
139 echo "Defaulting GYP_GENERATORS to ninja." 139 echo "Defaulting GYP_GENERATORS to ninja."
140 GYP_GENERATORS=ninja 140 GYP_GENERATORS=ninja
141 elif [ "$GYP_GENERATORS" != "ninja" ]; then 141 elif [ "$GYP_GENERATORS" != "ninja" ]; then
142 echo "Warning: GYP_GENERATORS set to '$GYP_GENERATORS'." 142 echo "Warning: GYP_GENERATORS set to '$GYP_GENERATORS'."
143 echo "Only GYP_GENERATORS=ninja has continuous coverage." 143 echo "Only GYP_GENERATORS=ninja has continuous coverage."
144 fi 144 fi
145 export GYP_GENERATORS 145 export GYP_GENERATORS
146 146
147 # Use our All target as the default 147 # Use our All target as the default
148 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All" 148 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All"
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 export GYP_DEFINES="${DEFINES}" 279 export GYP_DEFINES="${DEFINES}"
280 280
281 export GYP_GENERATORS="android" 281 export GYP_GENERATORS="android"
282 282
283 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All" 283 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All"
284 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} limit_to_target_all=1" 284 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} limit_to_target_all=1"
285 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} auto_regeneration=0" 285 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} auto_regeneration=0"
286 286
287 export CHROMIUM_GYP_FILE="${CHROME_SRC}/android_webview/all_webview.gyp" 287 export CHROMIUM_GYP_FILE="${CHROME_SRC}/android_webview/all_webview.gyp"
288 } 288 }
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