| Index: build/config/android/config.gni
 | 
| diff --git a/build/config/android/config.gni b/build/config/android/config.gni
 | 
| index 5a27e78e624cf77b67f9697973a6dd3ec22c9577..77ee311f7b78d9fa38ce45317ad776d85954fe71 100644
 | 
| --- a/build/config/android/config.gni
 | 
| +++ b/build/config/android/config.gni
 | 
| @@ -30,11 +30,6 @@ if (is_android) {
 | 
|      android_sdk_version = default_android_sdk_version
 | 
|      android_sdk_build_tools_version = default_android_sdk_build_tools_version
 | 
|  
 | 
| -    # This is set when building the Android WebView inside the Android build
 | 
| -    # system, using the 'android' gyp backend. The WebView code is still built
 | 
| -    # when this is unset, but builds using the normal chromium build system.
 | 
| -    is_android_webview_build = false
 | 
| -
 | 
|      android_default_keystore_path =
 | 
|          "//build/android/ant/chromium-debug.keystore"
 | 
|      android_default_keystore_name = "chromiumdebugkey"
 | 
| @@ -44,6 +39,9 @@ if (is_android) {
 | 
|      # identifying various build artifacts corresponding to a particular build of
 | 
|      # chrome (e.g. where to find archived symbols).
 | 
|      android_chrome_build_id = "\"\""
 | 
| +
 | 
| +    # Set to true to run findbugs on JAR targets.
 | 
| +    run_findbugs = false
 | 
|    }
 | 
|  
 | 
|    # Host stuff -----------------------------------------------------------------
 | 
| @@ -189,8 +187,4 @@ if (is_android) {
 | 
|    } else {
 | 
|      assert(false, "Unknown Android ABI: " + current_cpu)
 | 
|    }
 | 
| -} else {
 | 
| -  if (!defined(is_android_webview_build)) {
 | 
| -    is_android_webview_build = false
 | 
| -  }
 | 
|  }
 | 
| 
 |