Android WebView: change how the SDK jar is found.

build/android/envsetup_functions.sh

 #!/bin/bash
 
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Defines functions for envsetup.sh which sets up environment for building
 # Chromium on Android.  The build can be either use the Android NDK/SDK or
 # android source tree.  Each has a unique init function which calls functions
 # prefixed with "common_" that is common for both environment setups.
@@ skipping 270 matching lines @@
       ANDROID_SDK_TOOLS=$(python -c \
           "import os.path; \
           print os.path.relpath('${ANDROID_SDK_ROOT}/../tools/darwin', \
           '${ANDROID_BUILD_TOP}')")
       ;;
   esac
   DEFINES+=" android_webview_build=1"
   # 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=\$(GYP_ABS_ANDROID_TOP_DIR)/${ANDROID_SDK}"
+  DEFINES+=" android_sdk=NOT_USED_ON_WEBVIEW"
+  DEFINES+=" android_sdk_jar=\$(GYP_ABS_ANDROID_TOP_DIR)/${ANDROID_SDK}/android.jar"
   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}"
   DEFINES+=" android_toolchain=${ANDROID_TOOLCHAIN}"
   export GYP_DEFINES="${DEFINES}"
 
   export GYP_GENERATORS="android"
 
   export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All"
   export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} limit_to_target_all=1"
   export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} auto_regeneration=0"
 
   export CHROMIUM_GYP_FILE="${CHROME_SRC}/android_webview/all_webview.gyp"
 }