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

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

Issue 10823174: Roll Android SDK in android_tools repo to api version 16. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 4 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
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 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 export ANDROID_SDK_ROOT="${CHROME_SRC}/third_party/android_tools/sdk/" 159 export ANDROID_SDK_ROOT="${CHROME_SRC}/third_party/android_tools/sdk/"
160 fi 160 fi
161 161
162 # Makes sure ANDROID_BUILD_TOP is unset if build has option --sdk 162 # Makes sure ANDROID_BUILD_TOP is unset if build has option --sdk
163 unset ANDROID_BUILD_TOP 163 unset ANDROID_BUILD_TOP
164 164
165 # Set default target. 165 # Set default target.
166 export TARGET_PRODUCT="${TARGET_PRODUCT:-trygon}" 166 export TARGET_PRODUCT="${TARGET_PRODUCT:-trygon}"
167 167
168 # Android sdk platform version to use 168 # Android sdk platform version to use
169 export ANDROID_SDK_VERSION=15 169 export ANDROID_SDK_VERSION=16
170 # Unset toolchain so that it can be set based on TARGET_PRODUCT. 170 # Unset toolchain so that it can be set based on TARGET_PRODUCT.
171 # This makes it easy to switch between architectures. 171 # This makes it easy to switch between architectures.
172 unset ANDROID_TOOLCHAIN 172 unset ANDROID_TOOLCHAIN
173 173
174 common_vars_defines 174 common_vars_defines
175 175
176 DEFINES+=" sdk_build=1" 176 DEFINES+=" sdk_build=1"
177 # If we are building NDK/SDK, and in the upstream (open source) tree, 177 # If we are building NDK/SDK, and in the upstream (open source) tree,
178 # define a special variable for bringup purposes. 178 # define a special variable for bringup purposes.
179 case "${ANDROID_BUILD_TOP-undefined}" in 179 case "${ANDROID_BUILD_TOP-undefined}" in
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 282
283 export GYP_GENERATORS="android" 283 export GYP_GENERATORS="android"
284 284
285 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All" 285 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All"
286 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} limit_to_target_all=1" 286 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} limit_to_target_all=1"
287 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} auto_regeneration=0" 287 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} auto_regeneration=0"
288 288
289 # TODO(torne): This isn't upstream yet. Upstream it or remove this setting. 289 # TODO(torne): This isn't upstream yet. Upstream it or remove this setting.
290 export CHROMIUM_GYP_FILE="${CHROME_SRC}/build/all_android_webview.gyp" 290 export CHROMIUM_GYP_FILE="${CHROME_SRC}/build/all_android_webview.gyp"
291 } 291 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698