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

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

Issue 63153014: Roll to Android SDK 19 and build-tools 19.0.0. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: WebView still uses Android SDK 18 until it rolls. Created 7 years, 1 month 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 | build/android/pylib/constants.py » ('j') | 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 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 sdk_build_init() { 221 sdk_build_init() {
222 222
223 # Allow the caller to override a few environment variables. If any of them is 223 # Allow the caller to override a few environment variables. If any of them is
224 # unset, we default to a sane value that's known to work. This allows for 224 # unset, we default to a sane value that's known to work. This allows for
225 # experimentation with a custom SDK. 225 # experimentation with a custom SDK.
226 local sdk_defines="" 226 local sdk_defines=""
227 if [[ -z "${ANDROID_NDK_ROOT}" || ! -d "${ANDROID_NDK_ROOT}" ]]; then 227 if [[ -z "${ANDROID_NDK_ROOT}" || ! -d "${ANDROID_NDK_ROOT}" ]]; then
228 export ANDROID_NDK_ROOT="${CHROME_SRC}/third_party/android_tools/ndk/" 228 export ANDROID_NDK_ROOT="${CHROME_SRC}/third_party/android_tools/ndk/"
229 fi 229 fi
230 if [[ -z "${ANDROID_SDK_VERSION}" ]]; then 230 if [[ -z "${ANDROID_SDK_VERSION}" ]]; then
231 export ANDROID_SDK_VERSION=18 231 export ANDROID_SDK_VERSION=19
232 else 232 else
233 sdk_defines+=" android_sdk_version=${ANDROID_SDK_VERSION}" 233 sdk_defines+=" android_sdk_version=${ANDROID_SDK_VERSION}"
234 fi 234 fi
235 local sdk_suffix=platforms/android-${ANDROID_SDK_VERSION} 235 local sdk_suffix=platforms/android-${ANDROID_SDK_VERSION}
236 if [[ -z "${ANDROID_SDK_ROOT}" || \ 236 if [[ -z "${ANDROID_SDK_ROOT}" || \
237 ! -d "${ANDROID_SDK_ROOT}/${sdk_suffix}" ]]; then 237 ! -d "${ANDROID_SDK_ROOT}/${sdk_suffix}" ]]; then
238 export ANDROID_SDK_ROOT="${CHROME_SRC}/third_party/android_tools/sdk/" 238 export ANDROID_SDK_ROOT="${CHROME_SRC}/third_party/android_tools/sdk/"
239 else 239 else
240 sdk_defines+=" android_sdk_root=${ANDROID_SDK_ROOT}" 240 sdk_defines+=" android_sdk_root=${ANDROID_SDK_ROOT}"
241 fi 241 fi
242 if [[ -z "${ANDROID_SDK_BUILD_TOOLS_VERSION}" ]]; then 242 if [[ -z "${ANDROID_SDK_BUILD_TOOLS_VERSION}" ]]; then
243 export ANDROID_SDK_BUILD_TOOLS_VERSION=18.0.1 243 export ANDROID_SDK_BUILD_TOOLS_VERSION=19.0.0
244 fi 244 fi
245 245
246 unset ANDROID_BUILD_TOP 246 unset ANDROID_BUILD_TOP
247 247
248 # Set default target. 248 # Set default target.
249 export TARGET_PRODUCT="${TARGET_PRODUCT:-trygon}" 249 export TARGET_PRODUCT="${TARGET_PRODUCT:-trygon}"
250 250
251 # Unset toolchain so that it can be set based on TARGET_PRODUCT. 251 # Unset toolchain so that it can be set based on TARGET_PRODUCT.
252 # This makes it easy to switch between architectures. 252 # This makes it easy to switch between architectures.
253 unset ANDROID_TOOLCHAIN 253 unset ANDROID_TOOLCHAIN
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 export GYP_DEFINES="${DEFINES}" 326 export GYP_DEFINES="${DEFINES}"
327 327
328 export GYP_GENERATORS="android" 328 export GYP_GENERATORS="android"
329 329
330 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All" 330 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All"
331 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} limit_to_target_all=1" 331 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} limit_to_target_all=1"
332 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} auto_regeneration=0" 332 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} auto_regeneration=0"
333 333
334 export CHROMIUM_GYP_FILE="${CHROME_SRC}/android_webview/all_webview.gyp" 334 export CHROMIUM_GYP_FILE="${CHROME_SRC}/android_webview/all_webview.gyp"
335 } 335 }
OLDNEW
« no previous file with comments | « no previous file | build/android/pylib/constants.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698