Make _incremental targets work with emma_coverage=true

build/config/android/rules.gni

Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index a280be3b689b5fa15bb2f110573597ffc8ee58c4..5e4a4748f53807757388a2a432d5db9b18c746d5 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1449,6 +1449,9 @@ template("android_apk") {
       deps += [ invoker.alternative_locale_resource_dep ]
       has_alternative_locale_resource = true
     }
+    if (emma_coverage && !_emma_never_instrument) {

[jbudorick, 2016/02/22 00:43:03]

Why'd you move this into write_build_config?

[agrieve, 2016/02/23 02:59:12]

It's the thing that records your classpath based on your deps. Added a code
comment.

+      deps += [ "//third_party/android_tools:emma_device" ]
+    }
 
     proguard_enabled = _proguard_enabled
     if (_proguard_enabled) {
@@ -1676,11 +1679,6 @@ template("android_apk") {
       }
       args = [ "--inputs=@FileArg($_dex_arg_key)" ]
     }
-
-    if (emma_coverage && !_emma_never_instrument) {
-      no_locals = true
-      sources += [ "$android_sdk_root/tools/lib/emma_device.jar" ]
-    }
   }
 
   _native_libs_file_arg_dep = ":$build_config_target"