diff options
| author | 2023-01-05 11:00:52 +0000 | |
|---|---|---|
| committer | 2023-01-05 11:00:52 +0000 | |
| commit | 6afb4d7e9fd83eefa538ee7bddeec7a426ceea97 (patch) | |
| tree | fb1dfb574ecea057fb7154192b5c6c5617c1441a | |
| parent | 315c2c8f21816dbd0a309a1596f1f9bf508ecc1e (diff) | |
| parent | 7b3c09b9c5d2c25535c751a7e229827018fbf2f4 (diff) | |
Re-enable lint tests am: 2634652505 am: 98db8b94b3 am: 7b3c09b9c5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Permission/+/2376066
Change-Id: Ia47f564af993dfec531af7056439cc7f5892917f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | SafetyCenter/ConfigLintChecker/Android.bp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/SafetyCenter/ConfigLintChecker/Android.bp b/SafetyCenter/ConfigLintChecker/Android.bp index 08881ccd5..cb01188d1 100644 --- a/SafetyCenter/ConfigLintChecker/Android.bp +++ b/SafetyCenter/ConfigLintChecker/Android.bp @@ -44,12 +44,6 @@ java_library_host { java_test_host { name: "ConfigLintCheckerTest", - // 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/java/**/*.kt", ], @@ -61,5 +55,15 @@ 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", + } + ], }, } |