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
This commit is contained in:
@@ -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
|
||||
|
||||
|
Reference in New Issue
Block a user