Make remoting_android_client_java into template

Make remoting_android_client_java into template so that internal version of
remoting_apk can depend on custom version of google_play_services

BUG=544298

Review URL: https://codereview.chromium.org/1510033002

Cr-Commit-Position: refs/heads/master@{#364082}

2 files changed, 32 insertions, 19 deletions

diff --git a/remoting/android/BUILD.gn b/remoting/android/BUILD.gn
index 85b27e5..b14baf8 100644
--- a/remoting/android/BUILD.gn
+++ b/remoting/android/BUILD.gn
@@ -4,6 +4,7 @@
 
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
+import("//remoting/android/client_java_tmpl.gni")
 import("//remoting/android/remoting_apk_tmpl.gni")
 import("//remoting/remoting_options.gni")
 import("//remoting/tools/build/remoting_localize.gni")
@@ -90,25 +91,8 @@ android_resources("remoting_android_client_java_resources") {
   ]
 }
 
-android_library("remoting_android_client_java") {
-  DEPRECATED_java_in_dir = "java/src"
-  java_files = []
-
-  if (enable_cast) {
-    java_files +=
-        [ "cast/src/org/chromium/chromoting/CastExtensionHandler.java" ]
-  }
-
-  deps = [
-    ":remoting_android_client_java_resources",
-    "//base:base_java",
-    "//third_party/android_tools:android_support_v13_java",
-    "//third_party/android_tools:android_support_v7_appcompat_java",
-    "//third_party/android_tools:android_support_v7_mediarouter_java",
-    "//third_party/cardboard-java",
-    "//ui/android:ui_java",
-    google_play_services_library,
-  ]
+remoting_android_client_java_tmpl("remoting_android_client_java") {
+  remoting_google_play_services_library = google_play_services_library
 }
 
 action("remoting_cardboard_extract_native_lib") {
diff --git a/remoting/android/client_java_tmpl.gni b/remoting/android/client_java_tmpl.gni
new file mode 100644
index 0000000..91ef261
--- /dev/null
+++ b/remoting/android/client_java_tmpl.gni
@@ -0,0 +1,29 @@
+# Copyright 2015 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.
+
+import("//build/config/android/rules.gni")
+import("//remoting/remoting_options.gni")
+
+template("remoting_android_client_java_tmpl") {
+  android_library(target_name) {
+    DEPRECATED_java_in_dir = "//remoting/android/java/src"
+    java_files = []
+
+    if (enable_cast) {
+      java_files += [ "//remoting/android/cast/src/org/chromium/chromoting/CastExtensionHandler.java" ]
+    }
+
+    deps = [
+      "//base:base_java",
+      "//remoting/android:remoting_android_client_java_resources",
+      "//third_party/android_tools:android_support_v13_java",
+      "//third_party/android_tools:android_support_v7_appcompat_java",
+      "//third_party/android_tools:android_support_v7_mediarouter_java",
+      "//third_party/cardboard-java",
+      "//ui/android:ui_java",
+    ]
+
+    deps += [ invoker.remoting_google_play_services_library ]
+  }
+}