From f3944eb168db62fc43aaefee8152f67b6599667c Mon Sep 17 00:00:00 2001
From: Cole Faust <colefaust@google.com>
Date: Tue, 12 Jul 2022 14:53:38 -0700
Subject: [PATCH] Add -Xjvm-default=all

Android lint is being updated, and now requires
custom detectors to be compiled with -Xjvm-default=all.

This is a cherrypick without the fixes for indentation
errors because lint is not actually run on these older
branches, but the custom detectors are compiled.

Bug: 236431222
Test: Presubmits
Change-Id: Idf5302302496a6dff0f79ced4e20327041ae7a5a
(cherry picked from commit b331e4e254f12c27116f9e0993d64f84a04c0a04)
(cherry picked from commit 116be9d69f32b4c4f9ae880ddedf3e6e91fb5aac)
---
 packages/SystemUI/checks/Android.bp | 1 +
 tools/lint/Android.bp               | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/SystemUI/checks/Android.bp b/packages/SystemUI/checks/Android.bp
index 8457312dc4039..61fc48f6c2f98 100644
--- a/packages/SystemUI/checks/Android.bp
+++ b/packages/SystemUI/checks/Android.bp
@@ -32,6 +32,7 @@ java_library_host {
         "auto_service_annotations",
         "lint_api",
     ],
+    kotlincflags: ["-Xjvm-default=all"],
 }
 
 java_test_host {
diff --git a/tools/lint/Android.bp b/tools/lint/Android.bp
index 17547ef8b561a..3458359273b89 100644
--- a/tools/lint/Android.bp
+++ b/tools/lint/Android.bp
@@ -29,6 +29,7 @@ java_library_host {
         "auto_service_annotations",
         "lint_api",
     ],
+    kotlincflags: ["-Xjvm-default=all"],
 }
 
 java_test_host {