diff options
| author | sivachandra@chromium.org <sivachandra@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-23 18:07:01 +0000 |
|---|---|---|
| committer | sivachandra@chromium.org <sivachandra@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-23 18:07:01 +0000 |
| commit | 49059ca5b960b1c6e028920dace6d5f71932f00b (patch) | |
| tree | a2dec3475628bb416610ad124ff7c7d659dc56b3 /build/android | |
| parent | ee2816aeaf686262f3104f7a45b249d5a7f6427b (diff) | |
| download | chromium_src-49059ca5b960b1c6e028920dace6d5f71932f00b.zip chromium_src-49059ca5b960b1c6e028920dace6d5f71932f00b.tar.gz chromium_src-49059ca5b960b1c6e028920dace6d5f71932f00b.tar.bz2 | |
[Android] Set sdk version and sdk root in GYP_DEFINES via envsetup.sh.
NOTRY=True
Review URL: https://chromiumcodereview.appspot.com/23171022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219309 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android')
| -rwxr-xr-x | build/android/envsetup_functions.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/build/android/envsetup_functions.sh b/build/android/envsetup_functions.sh index fef07ef..2777d2d 100755 --- a/build/android/envsetup_functions.sh +++ b/build/android/envsetup_functions.sh @@ -223,16 +223,21 @@ sdk_build_init() { # Allow the caller to override a few environment variables. If any of them is # unset, we default to a sane value that's known to work. This allows for # experimentation with a custom SDK. + local sdk_defines="" if [[ -z "${ANDROID_NDK_ROOT}" || ! -d "${ANDROID_NDK_ROOT}" ]]; then export ANDROID_NDK_ROOT="${CHROME_SRC}/third_party/android_tools/ndk/" fi if [[ -z "${ANDROID_SDK_VERSION}" ]]; then export ANDROID_SDK_VERSION=18 + else + sdk_defines+=" android_sdk_version=${ANDROID_SDK_VERSION}" fi local sdk_suffix=platforms/android-${ANDROID_SDK_VERSION} if [[ -z "${ANDROID_SDK_ROOT}" || \ ! -d "${ANDROID_SDK_ROOT}/${sdk_suffix}" ]]; then export ANDROID_SDK_ROOT="${CHROME_SRC}/third_party/android_tools/sdk/" + else + sdk_defines+=" android_sdk_root=${ANDROID_SDK_ROOT}" fi if [[ -z "${ANDROID_SDK_BUILD_TOOLS_VERSION}" ]]; then export ANDROID_SDK_BUILD_TOOLS_VERSION=18.0.1 @@ -248,6 +253,9 @@ sdk_build_init() { unset ANDROID_TOOLCHAIN common_vars_defines + + DEFINES+="${sdk_defines}" + common_gyp_vars if [[ -n "$CHROME_ANDROID_BUILD_WEBVIEW" ]]; then |