Add error-prone to gradle build

So that error prone failures can be caught before dropping to
Google3.

Test: make
Change-Id: I0ff6f7a4c124433d907703fd1204395c34bab6bf

3 files changed, 14 insertions, 1 deletions

diff --git a/library/main/src/com/android/setupwizardlib/items/ButtonBarItem.java b/library/main/src/com/android/setupwizardlib/items/ButtonBarItem.java
index 55bbe75..06ce4ac 100644
--- a/library/main/src/com/android/setupwizardlib/items/ButtonBarItem.java
+++ b/library/main/src/com/android/setupwizardlib/items/ButtonBarItem.java
@@ -83,6 +83,7 @@ public class ButtonBarItem extends AbstractItem implements ItemInflater.ItemPare
         return mVisible;
     }
 
+    @Override
     public int getViewId() {
         return getId();
     }
diff --git a/library/self.gradle b/library/self.gradle
index 8a225c8..4f9c5ba 100644
--- a/library/self.gradle
+++ b/library/self.gradle
@@ -5,6 +5,18 @@ apply from: 'standalone-rules.gradle'
 apply from: '../tools/gradle/dist-library-instrumentation-tests.gradle'
 apply from: '../tools/gradle/dist-unit-tests.gradle'
 
+apply plugin: 'net.ltgt.errorprone'
+
+buildscript {
+    repositories {
+        maven { url "$rootDir/prebuilts/tools/common/m2/repository" }
+    }
+
+    dependencies {
+        classpath "net.ltgt.gradle:gradle-errorprone-plugin:0.0.13"
+    }
+}
+
 // Add targets for tests
 android.sourceSets {
     androidTest {
diff --git a/library/test/instrumentation/src/com/android/setupwizardlib/test/GlifPatternDrawableTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/test/GlifPatternDrawableTest.java
index 99c87fb..37ac41a 100644
--- a/library/test/instrumentation/src/com/android/setupwizardlib/test/GlifPatternDrawableTest.java
+++ b/library/test/instrumentation/src/com/android/setupwizardlib/test/GlifPatternDrawableTest.java
@@ -137,7 +137,7 @@ public class GlifPatternDrawableTest {
         assertEquals("Matrices should match", expected, canvas.getMatrix());
     }
 
-    @SmallTest
+    @Test
     public void testScaleToCanvasMaxSize() {
         final Canvas canvas = new Canvas();
         final Matrix expected = new Matrix(canvas.getMatrix());