diff options
| author | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-18 18:03:07 +0000 |
|---|---|---|
| committer | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-18 18:03:07 +0000 |
| commit | fdbbb29cd8bfc63ea8dc3962e29f4117fc2516d1 (patch) | |
| tree | 6a05be0eeb53e6ca2c95756e00c4d23311c4d186 /build | |
| parent | ef040097ba3411121e8235146e7b0fbdfce14128 (diff) | |
| download | chromium_src-fdbbb29cd8bfc63ea8dc3962e29f4117fc2516d1.zip chromium_src-fdbbb29cd8bfc63ea8dc3962e29f4117fc2516d1.tar.gz chromium_src-fdbbb29cd8bfc63ea8dc3962e29f4117fc2516d1.tar.bz2 | |
Revert 188747 "Android WebView: change how the SDK jar is found."
> Android WebView: change how the SDK jar is found.
>
> Setting android_sdk has unintended consequences which have recently
> broken the build, but we still need to be able to point to the sdk
> jarfile for now until this dependency has been solved for real; use the
> newly introduced android_sdk_jar variable from r188737 to specify this
> and set android_sdk to a harmless but invalid value rather than a make
> variable expansion.
>
> BUG=
>
> Review URL: https://codereview.chromium.org/12917006
TBR=torne@chromium.org
Review URL: https://codereview.chromium.org/12780016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188769 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rwxr-xr-x | build/android/envsetup_functions.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/build/android/envsetup_functions.sh b/build/android/envsetup_functions.sh index 53fb72f..88f4421 100755 --- a/build/android/envsetup_functions.sh +++ b/build/android/envsetup_functions.sh @@ -288,8 +288,7 @@ ${ANDROID_SDK_VERSION} # temporary until all uses of android_build_type are gone (crbug.com/184431) DEFINES+=" android_build_type=1" DEFINES+=" android_src=\$(GYP_ABS_ANDROID_TOP_DIR)" - DEFINES+=" android_sdk=NOT_USED_ON_WEBVIEW" - DEFINES+=" android_sdk_jar=\$(GYP_ABS_ANDROID_TOP_DIR)/${ANDROID_SDK}/android.jar" + DEFINES+=" android_sdk=\$(GYP_ABS_ANDROID_TOP_DIR)/${ANDROID_SDK}" DEFINES+=" android_sdk_root=\$(GYP_ABS_ANDROID_TOP_DIR)/${ANDROID_SDK}" DEFINES+=" android_sdk_tools=\$(GYP_ABS_ANDROID_TOP_DIR)/${ANDROID_SDK_TOOLS}" DEFINES+=" android_sdk_version=${ANDROID_SDK_VERSION}" |