From 5ab90aebaf07678f8841768c997f76ecb5c2db34 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Wed, 4 Jan 2023 14:35:55 -0800 Subject: Re-enable SystemUILintCheckerTest They can be re-enabled using a new feature to exclude certain classes from being loaded by tradefed. Bug: 240445172 Test: atest --host SystemUILintCheckerTest Change-Id: Id36a13cab0ebdbba9bffcf29ea7da0cfca2ea28c --- packages/SystemUI/checks/Android.bp | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/packages/SystemUI/checks/Android.bp b/packages/SystemUI/checks/Android.bp index 9671adde4904..29668d15b16c 100644 --- a/packages/SystemUI/checks/Android.bp +++ b/packages/SystemUI/checks/Android.bp @@ -37,12 +37,6 @@ java_library_host { java_test_host { name: "SystemUILintCheckerTest", - // 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: [ "tests/**/*.kt", "tests/**/*.java", @@ -55,5 +49,19 @@ java_test_host { ], test_options: { unit_test: true, + tradefed_options: [ + { + // lint bundles in some classes that were built with older versions + // of libraries, and no longer load. Since tradefed tries to load + // all classes in the jar to look for tests, it crashes loading them. + // Exclude these classes from tradefed's search. + name: "exclude-paths", + value: "org/apache", + }, + { + name: "exclude-paths", + value: "META-INF", + }, + ], }, } -- cgit v1.2.3-59-g8ed1b