Merge "Don't warn about missing classes before a build"

2 files changed, 16 insertions, 1 deletions

diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/MissingClassDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/MissingClassDetector.java
index fc9449a..2bcde0e 100644
--- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/MissingClassDetector.java
+++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/MissingClassDetector.java
@@ -250,7 +250,9 @@ public class MissingClassDetector extends LayoutDetector implements ClassScanner
 
     @Override
     public void checkClass(@NonNull ClassContext context, @NonNull ClassNode classNode) {
-        mHaveClasses = true;
+        if (!context.isFromClassLibrary()) {
+            mHaveClasses = true;
+        }
         String curr = classNode.name;
         if (mReferencedClasses != null && mReferencedClasses.containsKey(curr)) {
             mReferencedClasses.remove(curr);
diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/MissingClassDetectorTest.java b/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/MissingClassDetectorTest.java
index 3c6e8cb..4edf345 100644
--- a/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/MissingClassDetectorTest.java
+++ b/lint/libs/lint_checks/tests/src/com/android/tools/lint/checks/MissingClassDetectorTest.java
@@ -254,4 +254,17 @@ public class MissingClassDetectorTest extends AbstractCheckTest {
                 "registration/Bar.java.txt=>src/test/pkg/Foo/Bar.java"
             ));
     }
+
+    public void testNoClassesWithLibraries() throws Exception {
+        mScopes = null;
+        assertEquals(
+            "No warnings.",
+
+            lintProject(
+                "bytecode/AndroidManifestWrongRegs.xml=>AndroidManifest.xml",
+                "bytecode/.classpath=>.classpath",
+                "bytecode/GetterTest.jar.data=>libs/foo.jar"
+            ));
+    }
+
 }