Merge "Add "target_suffix" to gerrit_plugin()"
diff --git a/gerrit_plugin.bucklet b/gerrit_plugin.bucklet
index 2c374c8..922bd77 100644
--- a/gerrit_plugin.bucklet
+++ b/gerrit_plugin.bucklet
@@ -73,7 +73,8 @@
     gwt_module = None,
     manifest_entries = [],
     type = 'plugin',
-    visibility = ['PUBLIC']):
+    visibility = ['PUBLIC'],
+    target_suffix = ''):
   from multiprocessing import cpu_count
   from os import path,getcwd
   # TODO(davido): Remove this hack and replace all this mess with just
@@ -151,7 +152,7 @@
     )
 
   java_binary(
-    name = name,
+    name = name + target_suffix,
     manifest_file = ':%s__manifest' % name,
     merge_manifests = False,
     deps = [