aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2015-07-06 21:42:39 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-06 21:42:39 +0000
commit83d4b7ddf1a68c56de62036c475c7a1b08adfab8 (patch)
treed6d13ea799982a6b4ef06827f7ce5872edc516fb
parentfe49c931f70fd9d14514221919dcda4c87523d95 (diff)
parent407771ddea7bf210ca9d1c6f91ea93efdbd6d6cb (diff)
downloadplatform_sdk-83d4b7ddf1a68c56de62036c475c7a1b08adfab8.tar.gz
platform_sdk-83d4b7ddf1a68c56de62036c475c7a1b08adfab8.tar.bz2
platform_sdk-83d4b7ddf1a68c56de62036c475c7a1b08adfab8.zip
am 407771dd: Merge "Track lint API change" into studio-1.4-dev automerge: 131c91c automerge: 3f087d4
* commit '407771ddea7bf210ca9d1c6f91ea93efdbd6d6cb': Track lint API change
-rw-r--r--eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/EclipseLintClient.java3
1 files changed, 2 insertions, 1 deletions
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 bd6a55ae8..3dd424087 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.Configuration;
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 @@ public class EclipseLintClient extends LintClient {
@NonNull
@Override
- public Configuration getConfiguration(@NonNull Project project) {
+ public Configuration getConfiguration(@NonNull Project project, @Nullable LintDriver driver) {
return getConfigurationFor(project);
}