[android] Disable NewApi lint warning when building with emma coverage enabled.

build/config/android/internal_rules.gni

 # Copyright 2014 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.
 
 # Do not add any imports to non-//build directories here.
 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in.
 import("//build_overrides/build.gni")
 import("//build/config/android/config.gni")
 import("//build/config/dcheck_always_on.gni")
 import("//build/config/sanitizers/sanitizers.gni")
@@ skipping 671 matching lines @@
         rebase_path(depfile, root_build_dir),
         "--config-path",
         rebase_path(_suppressions_file, root_build_dir),
         "--manifest-path",
         rebase_path(invoker.android_manifest, root_build_dir),
         "--product-dir=.",
         "--processed-config-path",
         rebase_path(_config_path, root_build_dir),
         "--result-path",
         rebase_path(_result_path, root_build_dir),
-        "--enable",
       ]
 
+      if (defined(invoker.disable)) {
+        args += [ "--disable=${invoker.disable}" ]
+      }
+
       if (defined(invoker.create_cache) && invoker.create_cache) {
         args += [
           "--create-cache",
           "--silent",
         ]
       } else {
         inputs += invoker.java_files
         inputs += [
           invoker.jar_path,
           invoker.build_config,
@@ skipping 1767 matching lines @@
         _has_lint_target = true
         android_lint("${_template_name}__lint") {
           android_manifest = _android_manifest
           build_config = _build_config
           jar_path = _jar_path
           java_files = _java_files
           if (_java_files != []) {
             java_sources_file = _java_sources_file
           }
           deps = _accumulated_deps
+          if (_emma_instrument) {
+            # Disable the NewApi lint warning when building with coverage
+            # enabled. Coverage seems to mess with how the linter detects
+            # the usages of a new API within a conditional. See
+            # crbug.com/677320 for more.
+            disable = [ "NewApi" ]
+          }
         }
 
         if (_run_findbugs) {
           findbugs("${_template_name}__findbugs") {
             build_config = _build_config
             jar_path = _jar_path
             deps = _accumulated_deps
           }
         }
 
@@ skipping 313 matching lines @@
         rebase_path(root_build_dir, root_build_dir),
         "--packed-libraries-dir",
         rebase_path(_packed_libraries_dir, root_build_dir),
         "--libraries=${invoker.libraries_filearg}",
         "--filelistjson",
         rebase_path(invoker.file_list_json, root_build_dir),
       ]
     }
   }
 }