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

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

Issue 11260008: Pass target architecture to build/android/envsetup.sh (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: changed the comment in the code Created 8 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
« no previous file with comments | « no previous file | 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". Environment variable 9 # NDK/SDK: ". build/android/envsetup.sh". 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 echo "${CHROME_SRC}" 52 echo "${CHROME_SRC}"
53 fi 53 fi
54 54
55 # Android sdk platform version to use 55 # Android sdk platform version to use
56 export ANDROID_SDK_VERSION=16 56 export ANDROID_SDK_VERSION=16
57 57
58 # Source functions script. The file is in the same directory as this script. 58 # Source functions script. The file is in the same directory as this script.
59 . "$(dirname $BASH_SOURCE)"/envsetup_functions.sh 59 . "$(dirname $BASH_SOURCE)"/envsetup_functions.sh
60 60
61 if [[ "${ANDROID_SDK_BUILD}" -eq 1 ]]; then 61 if [[ "${ANDROID_SDK_BUILD}" -eq 1 ]]; then
62 process_options "$@"
63 if [[ -z "${TARGET_ARCH}" ]]; then
64 return 1
65 fi
62 sdk_build_init 66 sdk_build_init
63 # Sets up environment for building Chromium for Android with source. Expects 67 # Sets up environment for building Chromium for Android with source. Expects
64 # android environment setup and lunch. 68 # android environment setup and lunch.
65 elif [[ -z "$ANDROID_BUILD_TOP" || \ 69 elif [[ -z "$ANDROID_BUILD_TOP" || \
66 -z "$ANDROID_TOOLCHAIN" || \ 70 -z "$ANDROID_TOOLCHAIN" || \
67 -z "$ANDROID_PRODUCT_OUT" ]]; then 71 -z "$ANDROID_PRODUCT_OUT" ]]; then
68 echo "Android build environment variables must be set." 72 echo "Android build environment variables must be set."
69 echo "Please cd to the root of your Android tree and do: " 73 echo "Please cd to the root of your Android tree and do: "
70 echo " . build/envsetup.sh" 74 echo " . build/envsetup.sh"
71 echo " lunch" 75 echo " lunch"
(...skipping 29 matching lines...) Expand all
101 # This is just a simple wrapper of gyp_chromium, please don't add anything 105 # This is just a simple wrapper of gyp_chromium, please don't add anything
102 # in this function. 106 # in this function.
103 echo "GYP_GENERATORS set to '$GYP_GENERATORS'" 107 echo "GYP_GENERATORS set to '$GYP_GENERATORS'"
104 ( 108 (
105 "${CHROME_SRC}/build/gyp_chromium" --depth="${CHROME_SRC}" --check "$@" 109 "${CHROME_SRC}/build/gyp_chromium" --depth="${CHROME_SRC}" --check "$@"
106 ) 110 )
107 } 111 }
108 112
109 # FLOCK needs to be null on system that has no flock 113 # FLOCK needs to be null on system that has no flock
110 which flock > /dev/null || export FLOCK= 114 which flock > /dev/null || export FLOCK=
OLDNEW
« no previous file with comments | « no previous file | build/android/envsetup_functions.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698