[Android] Only invalidate objects that were received from Tango on resume.

components/invalidation.gypi

 # 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.
 
 {
   'targets': [
     {
       # GN version: //components/invalidation
       'target_name': 'invalidation',
       'type': 'static_library',
@@ skipping 162 matching lines @@
   'conditions': [
     ['OS == "android"', {
       'targets': [
         {
           'target_name': 'invalidation_java',
           'type': 'none',
           'dependencies': [
             '../base/base.gyp:base',
             '../sync/sync.gyp:sync_java',
             '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_javalib',
+            'invalidation_proto_java',

[nyquist, 2015/06/05 19:49:39]

reorder: local deps first in list.

[knn, 2015/06/08 11:09:01]

Done.

           ],
           'variables': {
             'java_in_dir': 'invalidation/android/java',
           },
           'includes': [ '../build/java.gypi' ],
         },
         {
+          'target_name': 'invalidation_proto_java',

[nyquist, 2015/06/05 19:49:39]

Could you also update GN?

[knn, 2015/06/08 11:09:01]

Thanks for the catch!

+          'type': 'none',
+          'sources': [
+            'invalidation/android/java/src/org/chromium/components/invalidation/serialized_invalidation.proto',
+          ],
+          'includes': [ '../build/protoc_java.gypi' ],
+        },
+        {
           'target_name': 'invalidation_javatests',
           'type': 'none',
           'dependencies': [
             'invalidation_java',
             '../base/base.gyp:base_java_test_support',
           ],
           'variables': {
             'java_in_dir': 'invalidation/android/javatests',
           },
           'includes': [ '../build/java.gypi' ],
         },
         {
+          'target_name': 'invalidation_junit_tests',
+          'type': 'none',
+          'dependencies': [
+            'invalidation_java',
+            '../base/base.gyp:base_java',
+            '../base/base.gyp:base_java_test_support',
+            '../testing/android/junit/junit_test.gyp:junit_test_support',
+          ],
+          'variables': {
+            'main_class': 'org.chromium.testing.local.JunitTestMain',
+            'src_paths': [
+              'invalidation/android/junit/'
+            ],
+          },
+          'includes': [ '../build/host_jar.gypi' ],
+        },
+        {
           'target_name': 'invalidation_jni_headers',
           'type': 'none',
           'sources': [
             'invalidation/android/java/src/org/chromium/components/invalidation/InvalidationService.java',
           ],
           'variables': {
             'jni_gen_package': 'components/invalidation',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
       ],
      },
     ],
   ],
 }