Merge branch 'stable-2.12'

* stable-2.12:
  Add 'eclipse-out' to the list of ignored folders
  Fix Eclipse project generation

Change-Id: I32545167c8fed5ba5ca8b0a7884a784a3e9f48bb

.buckconfig

diff --git a/.buckconfig b/.buckconfig
index 3958ab5..f6a0dde 100644
--- a/.buckconfig
+++ b/.buckconfig
@@ -7,7 +7,7 @@
   src_roots = java, resources
 
 [project]
-  ignore = .git
+  ignore = .git, eclipse-out
 
 [cache]
   mode = dir

.gitignore

diff --git a/.gitignore b/.gitignore
index c60f315..46def34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 buck-out/
 bucklets
+eclipse-out
 target/
 .buckversion
 .classpath

BUCK

diff --git a/BUCK b/BUCK
index 2260abb..538d217 100644
--- a/BUCK
+++ b/BUCK
@@ -23,7 +23,7 @@
 
 java_library(
   name = 'classpath',
-  deps = DEPS,
+  deps = DEPS + GERRIT_TESTS,
 )
 
 java_sources(