diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-17 18:33:47 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-17 18:33:47 +0000 |
| commit | b73825f9e9f435ad5e95f8c2ff294a6be73e29ea (patch) | |
| tree | 52bce46ad60e5f706d381de916308b767bfcad0d /build | |
| parent | d17d10547e1e7680f43564dc0d51b4939a2a1cf8 (diff) | |
| download | chromium_src-b73825f9e9f435ad5e95f8c2ff294a6be73e29ea.zip chromium_src-b73825f9e9f435ad5e95f8c2ff294a6be73e29ea.tar.gz chromium_src-b73825f9e9f435ad5e95f8c2ff294a6be73e29ea.tar.bz2 | |
android webview envsetup: Set android_ndk_root and android_sdk_version to dummy values.
They shouldn't be used in a webview build, so make that more obvious.
BUG=330631
Review URL: https://codereview.chromium.org/167193002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251696 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rwxr-xr-x | build/android/envsetup_functions.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build/android/envsetup_functions.sh b/build/android/envsetup_functions.sh index 5a37e15..1456ce9 100755 --- a/build/android/envsetup_functions.sh +++ b/build/android/envsetup_functions.sh @@ -143,8 +143,7 @@ webview_build_init() { # Use the latest API in the AOSP prebuilts directory (change with AOSP roll). android_sdk_version=18 - # For the WebView build we always use the NDK and SDK in the Android tree. - export ANDROID_NDK_ROOT=${ANDROID_BUILD_TOP}/prebuilts/ndk/8 + # For the WebView build we always use the SDK in the Android tree. export ANDROID_SDK_ROOT=${ANDROID_BUILD_TOP}/prebuilts/sdk/\ ${android_sdk_version} @@ -163,10 +162,11 @@ ${android_sdk_version} '${ANDROID_BUILD_TOP}')") DEFINES+=" android_webview_build=1" DEFINES+=" android_src=\$(PWD)" + DEFINES+=" android_ndk_root=ndk_root_unused_in_webview_build" DEFINES+=" android_sdk=\$(PWD)/${ANDROID_SDK}" DEFINES+=" android_sdk_root=\$(PWD)/${ANDROID_SDK}" DEFINES+=" android_sdk_tools=\$(PWD)/${ANDROID_SDK_TOOLS}" - DEFINES+=" android_sdk_version=${android_sdk_version}" + DEFINES+=" android_sdk_version=sdk_version_unused_in_webview_build" DEFINES+=" android_toolchain=${ANDROID_TOOLCHAIN}" if [[ -n "$CHROME_ANDROID_WEBVIEW_OFFICIAL_BUILD" ]]; then DEFINES+=" logging_like_official_build=1" |