Merge "gerrit_plugin: Allow to co-exist in tree and standalone plugins"
diff --git a/buckversion b/buckversion
index a0c6bc2..4965cea 100644
--- a/buckversion
+++ b/buckversion
@@ -1 +1 @@
-0fe4569e871fd6588f7cbfb4b1d4a14baa791a9f
+a0298c530b41eade38c703a3f528e390d619c5b4
diff --git a/gwt_module.bucklet b/gwt_module.bucklet
index d62c44a..461cd2d 100644
--- a/gwt_module.bucklet
+++ b/gwt_module.bucklet
@@ -26,4 +26,9 @@
     kw['resources'] += [gwt_xml]
   if 'srcs' in kw:
     kw['resources'] += kw['srcs']
+
+  # Buck does not accept duplicate resources. Callers may have
+  # included gwt_xml or srcs as part of resources, so de-dupe.
+  kw['resources'] = list(set(kw['resources']))
+
   java_library(**kw)
diff --git a/watchmanconfig b/watchmanconfig
new file mode 100644
index 0000000..8d9aeea
--- /dev/null
+++ b/watchmanconfig
@@ -0,0 +1,5 @@
+{
+  "ignore_dirs": [
+    "buck-out"
+  ]
+}