Merge "Add `libprotobuf-java-util-full` target for the benefit of external/kythe"
diff --git a/Android.bp b/Android.bp
index dafb778..f2f0e71 100644
--- a/Android.bp
+++ b/Android.bp
@@ -598,6 +598,20 @@
     java_version: "1.7",
 }
 
+java_library_host {
+  name: "libprotobuf-java-util-full",
+  defaults: ["libprotobuf_errorprone_defaults"],
+  srcs: [
+    "java/util/src/main/java/com/google/protobuf/util/*.java",
+  ],
+  static_libs: [
+    "gson-prebuilt-jar",
+    "guava-21.0",
+    "libprotobuf-java-full",
+  ],
+}
+
+
 // Java full library (compatibility for old host-side users)
 // =======================================================
 java_library_host {