[Android] emma_instr.py now removes any stale *.em/*sources.txt

third_party/cacheinvalidation/cacheinvalidation.gyp

 # Copyright 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.
 
 {
   'variables': {
     # This library should build cleanly with the extra warnings turned on
     # for Chromium.
     'chromium_code': 1,
-    'emma_never_instrument': 1,
   },
   'targets': [
     # The C++ files generated from the cache invalidation protocol buffers.
     {
       'target_name': 'cacheinvalidation_proto_cpp',
       'type': 'static_library',
       'variables': {
         # The relative path of the cacheinvalidation proto files from this
         # gyp-file.
         # TODO(akalin): Add a RULE_INPUT_DIR predefined variable to gyp so
@@ skipping 151 matching lines @@
             '../../build/isolate.gypi',
             'cacheinvalidation_unittests.isolate',
           ],
           'sources': [
             'cacheinvalidation_unittests.isolate',
           ],
         },
       ],
     }],
     ['OS == "android"', {
+      'variables': {
+        'emma_never_instrument': 1,
+      },
       'targets': [
         {
           'target_name': 'cacheinvalidation_proto_java',
           'type': 'none',
           'variables': {
             'proto_in_dir': '../../third_party/cacheinvalidation/src/proto',
           },
           'sources': [
             '<(proto_in_dir)/android_channel.proto',
             '<(proto_in_dir)/android_listener.proto',
@@ skipping 34 matching lines @@
             'src/java/com/google/ipc/invalidation/external/client/android/service/InvalidationService.aidl',
             'src/java/com/google/ipc/invalidation/external/client/android/service/ListenerService.aidl',
             'src/java/com/google/ipc/invalidation/testing/android/InvalidationTest.aidl',
           ],
           'includes': [ '../../build/java_aidl.gypi' ],
         },
       ],
     }],
   ],
 }