diff options
| author | 2024-08-14 10:24:06 -0700 | |
|---|---|---|
| committer | 2024-08-14 15:28:34 -0700 | |
| commit | 882d600d799865768acaa5558e7b306d56983e7c (patch) | |
| tree | 53a530483e02a85fad91ed5be7f69980859a6227 /java/java.go | |
| parent | 2fcc48e4a36d10af71dcdb374d54d3d9c100dd67 (diff) | |
Move kotlin stdlib to normal dependency tag
The kotlin standard library was added with a custom dependency tag,
which then required special handling later. We know up front whether
it will be treated the same as a static_libs or libs dependency, so
just reuse staticLibTag or libTag, and remove all the special handling.
Bug: 308016794
Test: TestKotlin
Flag: exempt REFACTOR
Change-Id: I2c5601faec284d88f28e13378d9cbffc24560efa
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/java/java.go b/java/java.go index 126d8f3a4..0d2704d24 100644 --- a/java/java.go +++ b/java/java.go @@ -421,8 +421,6 @@ var ( bootClasspathTag = dependencyTag{name: "bootclasspath", runtimeLinked: true} systemModulesTag = dependencyTag{name: "system modules", runtimeLinked: true} frameworkResTag = dependencyTag{name: "framework-res"} - kotlinStdlibTag = dependencyTag{name: "kotlin-stdlib", runtimeLinked: true} - kotlinAnnotationsTag = dependencyTag{name: "kotlin-annotations", runtimeLinked: true} kotlinPluginTag = dependencyTag{name: "kotlin-plugin", toolchain: true} proguardRaiseTag = dependencyTag{name: "proguard-raise"} certificateTag = dependencyTag{name: "certificate"} @@ -458,8 +456,6 @@ var ( bootClasspathTag, systemModulesTag, java9LibTag, - kotlinStdlibTag, - kotlinAnnotationsTag, kotlinPluginTag, syspropPublicStubDepTag, instrumentationForTag, @@ -568,8 +564,6 @@ type deps struct { srcJars android.Paths systemModules *systemModules aidlPreprocess android.OptionalPath - kotlinStdlib android.Paths - kotlinAnnotations android.Paths kotlinPlugins android.Paths aconfigProtoFiles android.Paths |