diff options
author | Tor Norbye <tnorbye@google.com> | 2012-02-23 11:12:43 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-23 11:12:43 -0800 |
commit | f793d46c60f5dd74d3e5c425911b39e2f19a5389 (patch) | |
tree | e472b0ce8f7bb49b70f2c7052d4005aaf46874e4 /lint | |
parent | dbf4c45d795d5f5caf99bd015f157909cd3bf59d (diff) | |
parent | 55072acc8b8d3128f1fbf85e1ad90ab5c1ceff23 (diff) | |
download | sdk-f793d46c60f5dd74d3e5c425911b39e2f19a5389.tar.gz sdk-f793d46c60f5dd74d3e5c425911b39e2f19a5389.tar.bz2 sdk-f793d46c60f5dd74d3e5c425911b39e2f19a5389.zip |
Merge "Lint API check should use main project's SDK version"
Diffstat (limited to 'lint')
3 files changed, 3 insertions, 4 deletions
diff --git a/lint/libs/lint_api/src/com/android/tools/lint/client/api/LintDriver.java b/lint/libs/lint_api/src/com/android/tools/lint/client/api/LintDriver.java index 3f32727ac..a749aceb8 100644 --- a/lint/libs/lint_api/src/com/android/tools/lint/client/api/LintDriver.java +++ b/lint/libs/lint_api/src/com/android/tools/lint/client/api/LintDriver.java @@ -676,14 +676,14 @@ public class LintDriver { private void runFileDetectors(@NonNull Project project, @Nullable Project main) { // Look up manifest information (but not for library projects) File manifestFile = project.getManifestFile(); - if (!project.isLibrary() && manifestFile != null) { + if (manifestFile != null) { XmlContext context = new XmlContext(this, project, main, manifestFile, null); IDomParser parser = mClient.getDomParser(); context.document = parser.parseXml(context); if (context.document != null) { project.readManifest(context.document); - if (mScope.contains(Scope.MANIFEST)) { + if (!project.isLibrary() && mScope.contains(Scope.MANIFEST)) { List<Detector> detectors = mScopeDetectors.get(Scope.MANIFEST); if (detectors != null) { XmlVisitor v = new XmlVisitor(parser, detectors); diff --git a/lint/libs/lint_api/src/com/android/tools/lint/detector/api/Project.java b/lint/libs/lint_api/src/com/android/tools/lint/detector/api/Project.java index d0de34c3e..d11fd7e99 100644 --- a/lint/libs/lint_api/src/com/android/tools/lint/detector/api/Project.java +++ b/lint/libs/lint_api/src/com/android/tools/lint/detector/api/Project.java @@ -421,7 +421,6 @@ public class Project { * @param document the DOM document for the manifest XML document */ public void readManifest(@NonNull Document document) { - assert !mLibrary; // Should call readManifest on the master project, not the library Element root = document.getDocumentElement(); if (root == null) { return; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ApiDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/ApiDetector.java index 7299fccc7..7c8154e13 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ApiDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/ApiDetector.java @@ -219,7 +219,7 @@ public class ApiDetector extends ResourceXmlDetector implements Detector.ClassSc private int getMinSdk(Context context) { if (mMinApi == -1) { - mMinApi = context.getProject().getMinSdk(); + mMinApi = context.getMainProject().getMinSdk(); } return mMinApi; |