commit c2ae430e96201cff2be6a9d58bf371ebab7a16db
author Tor Norbye <tnorbye@google.com> Mon Jul 06 21:43:08 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 06 21:43:08 2015 +0000
tree d6d13ea799982a6b4ef06827f7ce5872edc516fb
parent fe49c931f70fd9d14514221919dcda4c87523d95
parent 407771ddea7bf210ca9d1c6f91ea93efdbd6d6cb

am 407771dd: Merge "Track lint API change" into studio-1.4-dev automerge: 131c91c automerge: 3f087d4

* commit '407771ddea7bf210ca9d1c6f91ea93efdbd6d6cb':
  Track lint API change

eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/EclipseLintClient.java

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/EclipseLintClient.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/EclipseLintClient.java
index bd6a55a..3dd4240 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/EclipseLintClient.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/EclipseLintClient.java
@@ -36,6 +36,7 @@
 import com.android.tools.lint.client.api.IssueRegistry;
 import com.android.tools.lint.client.api.JavaParser;
 import com.android.tools.lint.client.api.LintClient;
+import com.android.tools.lint.client.api.LintDriver;
 import com.android.tools.lint.client.api.XmlParser;
 import com.android.tools.lint.detector.api.ClassContext;
 import com.android.tools.lint.detector.api.Context;
@@ -368,7 +369,7 @@
 
     @NonNull
     @Override
-    public Configuration getConfiguration(@NonNull Project project) {
+    public Configuration getConfiguration(@NonNull Project project, @Nullable LintDriver driver) {
         return getConfigurationFor(project);
     }