Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(16)

Unified Diff: components/invalidation.gypi

Issue 1144543009: [Android] Only invalidate objects that were received from Tango on resume. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nits Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/invalidation.gypi
diff --git a/components/invalidation.gypi b/components/invalidation.gypi
index 8378c2cd26ed5e761874018910bd240c2aec4b8d..701eb626fbf517c314e660b84c454c80983881f7 100644
--- a/components/invalidation.gypi
+++ b/components/invalidation.gypi
@@ -180,6 +180,7 @@
'../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',
@@ -187,6 +188,14 @@
'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': [
@@ -199,6 +208,23 @@
'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': [

Powered by Google App Engine
This is Rietveld 408576698