Make chrome_shell_apk build

components/invalidation/BUILD.gn

 # 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.
 if (is_android) {
   import("//build/config/android/rules.gni")
 }
 
 static_library("invalidation") {
   sources = [
     "ack_handle.cc",
@@ skipping 60 matching lines @@
       "sync_invalidation_listener.cc",
       "sync_invalidation_listener.h",
       "sync_system_resources.cc",
       "sync_system_resources.h",
       "ticl_invalidation_service.cc",
       "ticl_invalidation_service.h",
       "ticl_settings_provider.cc",
       "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" ]
-  }
 
   public_deps = [
     "//third_party/cacheinvalidation",
   ]
   deps = [
     "//base",
     "//components/gcm_driver",
     "//components/keyed_service/core",
     "//components/pref_registry",
     "//components/signin/core/browser",
     "//google_apis",
     "//jingle:notifier",
 
     # TODO(sync): Remove this (http://crbug.com/133352);
     "//third_party/protobuf:protobuf_lite",
     # "//third_party/cacheinvalidation/src/google/cacheinvalidation:cacheinvalidation_proto_cpp",
   ]
+
+  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" ]
+  }
 }
 
 static_library("unittests") {
   testonly = true
   sources = []
   deps = [
     ":invalidation",
     ":test_support",
   ]
   if (is_android) {
@@ skipping 17 matching lines @@
     "invalidation_service_test_template.h",
     "invalidation_test_util.cc",
     "invalidation_test_util.h",
     "invalidator_test_template.cc",
     "invalidator_test_template.h",
     "object_id_invalidation_map_test_util.cc",
     "object_id_invalidation_map_test_util.h",
     "unacked_invalidation_set_test_util.cc",
     "unacked_invalidation_set_test_util.h",
   ]
-  if (!is_android) {
-    sources += [
-      "p2p_invalidation_service.cc",
-      "p2p_invalidation_service.h",
-    ]
-  }
-  if (is_android) {
-    deps += [
-      ":jni_headers",
-    ]
-  }
+
   deps = [
     "//base",
     "//components/gcm_driver:test_support",
     "//components/keyed_service/core",
     "//google_apis",
     "//jingle:notifier",
     "//jingle:notifier_test_util",
     "//net",
     "//testing/gmock",
     "//third_party/cacheinvalidation",
 
     # TODO(sync): Remove this (http://crbug.com/133352);
     "//third_party/protobuf:protobuf_lite",
     # "//third_party/cacheinvalidation/src/google/cacheinvalidation:cacheinvalidation_proto_cpp",
   ]
+
+  if (is_android) {
+    deps += [
+      ":jni_headers",
+    ]
+  } else {
+    sources += [
+      "p2p_invalidation_service.cc",
+      "p2p_invalidation_service.h",
+    ]
+  }
 }
 
 if (is_android) {
-  static_library("java") {
+  android_library("java") {
     deps = [
-      "//base",
-      "//sync:java",
-      "//third_party/cacheinvalidation:javalib",
+      "//base:base_java",
+      "//sync/android:sync_java",
+      "//third_party/cacheinvalidation:cacheinvalidation_javalib",
+      "//third_party/cacheinvalidation:cacheinvalidation_proto_java",
+      "//third_party/jsr-305:jsr_305_javalib",
     ]
-    sources = [
-    ]
+    DEPRECATED_java_in_dir = "android/java/src"
   }
-  static_library("javatests") {
+  android_library("javatests") {
     deps = [
       ":java",
-      "//base:java_test_support",
+      "//base:base_java",
+      "//base:base_java_test_support",
+      "//sync/android:sync_java",
+      "//third_party/cacheinvalidation:cacheinvalidation_javalib",
+      "//third_party/cacheinvalidation:cacheinvalidation_proto_java",
     ]
+    DEPRECATED_java_in_dir = "android/javatests/src"
   }
   generate_jni("jni_headers") {
     sources = [
       "android/java/src/org/chromium/components/invalidation/InvalidationService.java",
     ]
     jni_package = "components/invalidation"
   }
 }