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

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

Issue 10837226: Use NDK r8b and 64-bit toolchain (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync 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 | Annotate | Revision Log
« no previous file with comments | « DEPS ('k') | build/android/envsetup_functions.sh » ('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 # Sets up environment for building Chromium on Android. It can either be 7 # Sets up environment for building Chromium on Android. It can either be
8 # compiled with the Android tree or using the Android SDK/NDK. To build with 8 # compiled with the Android tree or using the Android SDK/NDK. To build with
9 # NDK/SDK: ". build/android/envsetup.sh --sdk". Environment variable 9 # NDK/SDK: ". build/android/envsetup.sh --sdk". Environment variable
10 # ANDROID_SDK_BUILD=1 will then be defined and used in the rest of the setup to 10 # ANDROID_SDK_BUILD=1 will then be defined and used in the rest of the setup to
(...skipping 11 matching lines...) Expand all
22 done 22 done
23 23
24 if [[ "${ANDROID_SDK_BUILD}" -eq 1 ]]; then 24 if [[ "${ANDROID_SDK_BUILD}" -eq 1 ]]; then
25 echo "Using SDK build" 25 echo "Using SDK build"
26 fi 26 fi
27 27
28 host_os=$(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/') 28 host_os=$(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')
29 29
30 case "${host_os}" in 30 case "${host_os}" in
31 "linux") 31 "linux")
32 toolchain_dir="linux-x86" 32 toolchain_dir="linux-x86_64"
33 ;; 33 ;;
34 "mac") 34 "mac")
35 toolchain_dir="darwin-x86" 35 toolchain_dir="darwin-x86"
36 ;; 36 ;;
37 *) 37 *)
38 echo "Host platform ${host_os} is not supported" >& 2 38 echo "Host platform ${host_os} is not supported" >& 2
39 return 1 39 return 1
40 esac 40 esac
41 41
42 CURRENT_DIR="$(readlink -f "$(dirname $BASH_SOURCE)/../../")" 42 CURRENT_DIR="$(readlink -f "$(dirname $BASH_SOURCE)/../../")"
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 export AR_target=$(basename ${ANDROID_TOOLCHAIN}/*-ar) 101 export AR_target=$(basename ${ANDROID_TOOLCHAIN}/*-ar)
102 102
103 # Performs a gyp_chromium run to convert gyp->Makefile for android code. 103 # Performs a gyp_chromium run to convert gyp->Makefile for android code.
104 android_gyp() { 104 android_gyp() {
105 echo "GYP_GENERATORS set to '$GYP_GENERATORS'" 105 echo "GYP_GENERATORS set to '$GYP_GENERATORS'"
106 "${CHROME_SRC}/build/gyp_chromium" --depth="${CHROME_SRC}" --check "$@" 106 "${CHROME_SRC}/build/gyp_chromium" --depth="${CHROME_SRC}" --check "$@"
107 } 107 }
108 108
109 # FLOCK needs to be null on system that has no flock 109 # FLOCK needs to be null on system that has no flock
110 which flock > /dev/null || export FLOCK= 110 which flock > /dev/null || export FLOCK=
OLDNEW
« no previous file with comments | « DEPS ('k') | build/android/envsetup_functions.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698