Massive refactor of the Android invalidation code.

components/invalidation/BUILD.gn

Index: components/invalidation/BUILD.gn
diff --git a/components/invalidation/BUILD.gn b/components/invalidation/BUILD.gn
index 6ab8569922918506965c0fbace58aff776b044cb..45b271e713ab74fe2f2e49568ff28e6e5fceba3b 100644
--- a/components/invalidation/BUILD.gn
+++ b/components/invalidation/BUILD.gn
@@ -75,6 +75,15 @@ static_library("invalidation") {
       "ticl_settings_provider.h",
     ]
   }
+  if (is_android) {
+    sources += [
+      "android/component_jni_registrar.cc",
+      "android/component_jni_registrar.h",
+      "invalidation_service_android.cc",
+      "invalidation_service_android.h",
+    ]
+    deps += [ ":jni_headers" ]
+  }
 
   deps = [
     "//base",
@@ -96,6 +105,21 @@ static_library("invalidation") {
   ]
 }
 
+static_library("unittests") {
+  testonly = true
+  sources = []
+  deps = [
+    ":invalidation",
+    ":test_support",
+  ]
+  if (is_android) {
+    deps += [
+      ":javatests",
+      ":jni_headers",
+    ]
+  }
+}
+
 static_library("test_support") {
   testonly = true
   sources = [
@@ -122,7 +146,11 @@ static_library("test_support") {
       "p2p_invalidation_service.h",
     ]
   }
-
+  if (is_android) {
+    deps += [
+      ":jni_headers",
+    ]
+  }
   deps = [
     "//base",
     "//components/gcm_driver:test_support",
@@ -139,3 +167,34 @@ static_library("test_support") {
     # "//third_party/cacheinvalidation/src/google/cacheinvalidation:cacheinvalidation_proto_cpp",
   ]
 }
+
+if (is_android) {
+  static_library("java") {
+    deps = [
+      "//base",
+      "//sync:java",
+      "//third_party/cacheinvalidation:javalib",
+    ]
+    sources = [
+    ]
+  }
+  static_library("javatests") {
+    deps = [
+      ":java",
+      "//base:java_test_support",
+    ]
+  }
+  static_library("unittests_apk") {
+    deps = [
+      ":java",
+      ":javatests",
+      ":unittests",
+    ]
+  }
+  generate_jni("jni_headers") {
+    sources = [
+      "android/java/src/org/chromium/components/invalidation/InvalidationService.java",
+    ]
+    jni_package = "components/invalidation"
+  }
+}