diff --git a/tools/lint/Android.bp b/tools/lint/Android.bp
index 3458359273b89..2601041455050 100644
--- a/tools/lint/Android.bp
+++ b/tools/lint/Android.bp
@@ -34,6 +34,12 @@ java_library_host {
 
 java_test_host {
     name: "AndroidFrameworkLintCheckerTest",
+    // TODO(b/239881504): Since this test was written, Android
+    // Lint was updated, and now includes classes that were
+    // compiled for java 15. The soong build doesn't support
+    // java 15 yet, so we can't compile against "lint". Disable
+    // the test until java 15 is supported.
+    enabled: false,
     srcs: ["checks/src/test/java/**/*.kt"],
     static_libs: [
         "AndroidFrameworkLintChecker",