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

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

Issue 149103002: android envsetup: Remove default_target=All (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 esac 133 esac
134 } 134 }
135 135
136 136
137 ################################################################################ 137 ################################################################################
138 # Exports common GYP variables based on variable DEFINES and CHROME_SRC. 138 # Exports common GYP variables based on variable DEFINES and CHROME_SRC.
139 ################################################################################ 139 ################################################################################
140 common_gyp_vars() { 140 common_gyp_vars() {
141 export GYP_DEFINES="${DEFINES}" 141 export GYP_DEFINES="${DEFINES}"
142 142
143 # Use our All target as the default
144 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All"
145
146 # TODO(thakis): Remove this after a week or two. Sourcing envsetup.sh used to 143 # TODO(thakis): Remove this after a week or two. Sourcing envsetup.sh used to
147 # set this variable, but now that all_android.gyp is gone having it set will 144 # set this variable, but now that all_android.gyp is gone having it set will
148 # lead to errors, so explicitly unset it to remove it from the environment of 145 # lead to errors, so explicitly unset it to remove it from the environment of
149 # developers who keep their shells open for weeks (most of them, probably). 146 # developers who keep their shells open for weeks (most of them, probably).
150 unset CHROMIUM_GYP_FILE 147 unset CHROMIUM_GYP_FILE
151 } 148 }
152 149
153 150
154 ################################################################################ 151 ################################################################################
155 # Prints out help message on usage. 152 # Prints out help message on usage.
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 fi 316 fi
320 export GYP_DEFINES="${DEFINES}" 317 export GYP_DEFINES="${DEFINES}"
321 318
322 export GYP_GENERATORS="android" 319 export GYP_GENERATORS="android"
323 320
324 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All" 321 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All"
325 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} limit_to_target_all=1" 322 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} limit_to_target_all=1"
326 323
327 export CHROMIUM_GYP_FILE="${CHROME_SRC}/android_webview/all_webview.gyp" 324 export CHROMIUM_GYP_FILE="${CHROME_SRC}/android_webview/all_webview.gyp"
328 } 325 }
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