diff options
author | Yuriy Solodkyy <solodkyy@google.com> | 2022-01-28 17:17:28 +0000 |
---|---|---|
committer | Yuriy Solodkyy <solodkyy@google.com> | 2022-01-28 18:07:04 +0000 |
commit | 5f82dc1fa722d6cc96c68bd824d900cc62e90254 (patch) | |
tree | 09598ef8e00032b199980e6e324ac73296700925 /android-lint/src | |
parent | a30d6aef029eb9141d9daa7f4105e4c678523517 (diff) | |
download | idea-5f82dc1fa722d6cc96c68bd824d900cc62e90254.tar.gz |
Clean up IDE library models
Bug: n/a
Test: n/a
Change-Id: Iaa40935ccd8108883962d27750cdec8f8c3fb043
Diffstat (limited to 'android-lint/src')
-rw-r--r-- | android-lint/src/com/android/tools/idea/lint/model/LintModelFactory.kt | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/android-lint/src/com/android/tools/idea/lint/model/LintModelFactory.kt b/android-lint/src/com/android/tools/idea/lint/model/LintModelFactory.kt index 0b73d7abaf6..6802e111b51 100644 --- a/android-lint/src/com/android/tools/idea/lint/model/LintModelFactory.kt +++ b/android-lint/src/com/android/tools/idea/lint/model/LintModelFactory.kt @@ -168,19 +168,19 @@ class LintModelFactory : LintModelModuleLoader { // TODO: Construct file objects lazily! return DefaultLintModelAndroidLibrary( identifier = library.getIdentifier(), - manifest = File(library.manifest), + manifest = library.manifest, // TODO - expose compile jar vs impl jar? - jarFiles = library.runtimeJarFiles.map { File(it) }, + jarFiles = library.runtimeJarFiles, folder = library.folder!!, // Needed for workaround for b/66166521 - resFolder = File(library.resFolder), - assetsFolder = File(library.assetsFolder), - lintJar = library.lintJar?.let(::File), - publicResources = File(library.publicResources), - symbolFile = File(library.symbolFile), - externalAnnotations = File(library.externalAnnotations), + resFolder = library.resFolder, + assetsFolder = library.assetsFolder, + lintJar = library.lintJar, + publicResources = library.publicResources, + symbolFile = library.symbolFile, + externalAnnotations = library.externalAnnotations, provided = dependency.isProvided, resolvedCoordinates = library.getMavenName(), - proguardRules = File(library.proguardRules) + proguardRules = library.proguardRules ) } @@ -200,7 +200,7 @@ class LintModelFactory : LintModelModuleLoader { return DefaultLintModelModuleLibrary( identifier = dependency.getIdentifier(), projectPath = projectPath, - lintJar = dependency.target.lintJar?.let(::File), + lintJar = dependency.target.lintJar, provided = false ) } |