diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-31 17:25:20 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-31 17:25:20 +0000 |
| commit | cbb6459694f9080a28aeb99b234426b8069dbe56 (patch) | |
| tree | b778a75538e27f5f91013c03d7830fc655c0c251 /build/android/envsetup.sh | |
| parent | 361c7912344481db45a790ef764282f9a0b78664 (diff) | |
| download | chromium_src-cbb6459694f9080a28aeb99b234426b8069dbe56.zip chromium_src-cbb6459694f9080a28aeb99b234426b8069dbe56.tar.gz chromium_src-cbb6459694f9080a28aeb99b234426b8069dbe56.tar.bz2 | |
Pass target architecture to build/android/envsetup.sh
TARGET_PRODUCT and other parameters generated by lunch command is not
necessary any more since the build got switched to being based on
SDK/NDK. This CL lets the target architecture be passed from envsetup.sh.
Currently two arch's values are accepted: arm(default), x86.
TEST=Built successfully with both target architecture values - arm and x86
using following commands:
. build/android/envsetup.sh -> arm
. build/android/envsetup.sh -t arm -> arm
. build/android/envsetup.sh -t x86 -> x86
Other commands tested:
. build/android/envsetup.sh -h -> prints help
. build/android/envsetup.sh -t bogus -> prints help and stops
BUG=
Review URL: https://codereview.chromium.org/11260008
Patch from Jinsuk Kim <jinsukkim@google.com>.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165185 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android/envsetup.sh')
| -rwxr-xr-x | build/android/envsetup.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/build/android/envsetup.sh b/build/android/envsetup.sh index 9083584..390f07c 100755 --- a/build/android/envsetup.sh +++ b/build/android/envsetup.sh @@ -59,6 +59,10 @@ export ANDROID_SDK_VERSION=16 . "$(dirname $BASH_SOURCE)"/envsetup_functions.sh if [[ "${ANDROID_SDK_BUILD}" -eq 1 ]]; then + process_options "$@" + if [[ -z "${TARGET_ARCH}" ]]; then + return 1 + fi sdk_build_init # Sets up environment for building Chromium for Android with source. Expects # android environment setup and lunch. |