diff options
| author | 2023-01-05 10:23:52 +0000 | |
|---|---|---|
| committer | 2023-01-05 10:23:52 +0000 | |
| commit | 7b3c09b9c5d2c25535c751a7e229827018fbf2f4 (patch) | |
| tree | 32fad0a224612b0cc274219f15d7f6a54c7bb726 | |
| parent | a9ed2e3f88e45781bc41093d545b2ac5f1c8f400 (diff) | |
| parent | 98db8b94b345034b2f9ce83541d52fd5b439ab0e (diff) | |
Re-enable lint tests am: 2634652505 am: 98db8b94b3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Permission/+/2376066
Change-Id: Ief1838000d5147bdc451f3215b61f58a21f27466
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 bbd1fccf6..280de8cae 100644 --- a/SafetyCenter/ConfigLintChecker/Android.bp +++ b/SafetyCenter/ConfigLintChecker/Android.bp @@ -40,12 +40,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", ], @@ -57,5 +51,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", + } + ], }, } |