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

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

Issue 116833006: Skip downloading of nacl toolchain for android. Nacl is not enabled in android and it takes too lon… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Skip nacl toolchain for android Created 7 years 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
« no previous file with comments | « no previous file | build/download_nacl_toolchains.py » ('j') | build/download_nacl_toolchains.py » ('J')
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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 ;; 125 ;;
126 "mips") 126 "mips")
127 DEFINES+=" target_arch=mipsel" 127 DEFINES+=" target_arch=mipsel"
128 DEFINES+=" mips_arch_variant=mips32r1" 128 DEFINES+=" mips_arch_variant=mips32r1"
129 ;; 129 ;;
130 *) 130 *)
131 echo "TARGET_ARCH: ${TARGET_ARCH} is not supported." >& 2 131 echo "TARGET_ARCH: ${TARGET_ARCH} is not supported." >& 2
132 print_usage 132 print_usage
133 return 1 133 return 1
134 esac 134 esac
135
136 # nacl isn't enabled for android, avoid downloading the toolchain.
137 DEFINES+=" -Ddisable_nacl=1"
135 } 138 }
136 139
137 140
138 ################################################################################ 141 ################################################################################
139 # Exports common GYP variables based on variable DEFINES and CHROME_SRC. 142 # Exports common GYP variables based on variable DEFINES and CHROME_SRC.
140 ################################################################################ 143 ################################################################################
141 common_gyp_vars() { 144 common_gyp_vars() {
142 export GYP_DEFINES="${DEFINES}" 145 export GYP_DEFINES="${DEFINES}"
143 146
144 # Set GYP_GENERATORS to ninja if it's currently unset or null. 147 # Set GYP_GENERATORS to ninja if it's currently unset or null.
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 # Set default target. 251 # Set default target.
249 export TARGET_PRODUCT="${TARGET_PRODUCT:-trygon}" 252 export TARGET_PRODUCT="${TARGET_PRODUCT:-trygon}"
250 253
251 # Unset toolchain so that it can be set based on TARGET_PRODUCT. 254 # Unset toolchain so that it can be set based on TARGET_PRODUCT.
252 # This makes it easy to switch between architectures. 255 # This makes it easy to switch between architectures.
253 unset ANDROID_TOOLCHAIN 256 unset ANDROID_TOOLCHAIN
254 257
255 common_vars_defines 258 common_vars_defines
256 259
257 DEFINES+="${sdk_defines}" 260 DEFINES+="${sdk_defines}"
258 261
atreat 2013/12/20 19:55:00 Unnecessary whitespace change.
navabi 2013/12/20 20:37:00 nit: remove this space
259 common_gyp_vars 262 common_gyp_vars
260 263
261 if [[ -n "$CHROME_ANDROID_BUILD_WEBVIEW" ]]; then 264 if [[ -n "$CHROME_ANDROID_BUILD_WEBVIEW" ]]; then
262 # Can not build WebView with NDK/SDK because it needs the Android build 265 # Can not build WebView with NDK/SDK because it needs the Android build
263 # system and build inside an Android source tree. 266 # system and build inside an Android source tree.
264 echo "Can not build WebView with NDK/SDK. Requires android source tree." \ 267 echo "Can not build WebView with NDK/SDK. Requires android source tree." \
265 >& 2 268 >& 2
266 echo "Try . build/android/envsetup.sh instead." >& 2 269 echo "Try . build/android/envsetup.sh instead." >& 2
267 return 1 270 return 1
268 fi 271 fi
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 export GYP_DEFINES="${DEFINES}" 327 export GYP_DEFINES="${DEFINES}"
325 328
326 export GYP_GENERATORS="android" 329 export GYP_GENERATORS="android"
327 330
328 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All" 331 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All"
329 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} limit_to_target_all=1" 332 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} limit_to_target_all=1"
330 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} auto_regeneration=0" 333 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} auto_regeneration=0"
331 334
332 export CHROMIUM_GYP_FILE="${CHROME_SRC}/android_webview/all_webview.gyp" 335 export CHROMIUM_GYP_FILE="${CHROME_SRC}/android_webview/all_webview.gyp"
333 } 336 }
OLDNEW
« no previous file with comments | « no previous file | build/download_nacl_toolchains.py » ('j') | build/download_nacl_toolchains.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698