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

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

Issue 23171022: [Android] Set sdk version and sdk root in GYP_DEFINES via envsetup.sh. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | 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 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 unset ANDROID_BUILD_TOP 241 unset ANDROID_BUILD_TOP
242 242
243 # Set default target. 243 # Set default target.
244 export TARGET_PRODUCT="${TARGET_PRODUCT:-trygon}" 244 export TARGET_PRODUCT="${TARGET_PRODUCT:-trygon}"
245 245
246 # Unset toolchain so that it can be set based on TARGET_PRODUCT. 246 # Unset toolchain so that it can be set based on TARGET_PRODUCT.
247 # This makes it easy to switch between architectures. 247 # This makes it easy to switch between architectures.
248 unset ANDROID_TOOLCHAIN 248 unset ANDROID_TOOLCHAIN
249 249
250 common_vars_defines 250 common_vars_defines
251
252 DEFINES+=" android_sdk_root=${ANDROID_SDK_ROOT}"
Yaron 2013/08/23 00:40:50 Why do this? Just to simplify the buildbot script?
Siva Chandra 2013/08/23 00:58:29 Done.
253 DEFINES+=" android_sdk_version=${ANDROID_SDK_VERSION}"
254
251 common_gyp_vars 255 common_gyp_vars
252 256
253 if [[ -n "$CHROME_ANDROID_BUILD_WEBVIEW" ]]; then 257 if [[ -n "$CHROME_ANDROID_BUILD_WEBVIEW" ]]; then
254 # Can not build WebView with NDK/SDK because it needs the Android build 258 # Can not build WebView with NDK/SDK because it needs the Android build
255 # system and build inside an Android source tree. 259 # system and build inside an Android source tree.
256 echo "Can not build WebView with NDK/SDK. Requires android source tree." \ 260 echo "Can not build WebView with NDK/SDK. Requires android source tree." \
257 >& 2 261 >& 2
258 echo "Try . build/android/envsetup.sh instead." >& 2 262 echo "Try . build/android/envsetup.sh instead." >& 2
259 return 1 263 return 1
260 fi 264 fi
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 export GYP_DEFINES="${DEFINES}" 322 export GYP_DEFINES="${DEFINES}"
319 323
320 export GYP_GENERATORS="android" 324 export GYP_GENERATORS="android"
321 325
322 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All" 326 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All"
323 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} limit_to_target_all=1" 327 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} limit_to_target_all=1"
324 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} auto_regeneration=0" 328 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} auto_regeneration=0"
325 329
326 export CHROMIUM_GYP_FILE="${CHROME_SRC}/android_webview/all_webview.gyp" 330 export CHROMIUM_GYP_FILE="${CHROME_SRC}/android_webview/all_webview.gyp"
327 } 331 }
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