Merge changes from topic "sdk_repo_license"
* changes: Generate sdk_repo notice files from license metadata Annotate more java dependencies for licensing Track transitive packaged license deps of containers
This commit is contained in:
15
java/java.go
15
java/java.go
@@ -274,6 +274,9 @@ type dependencyTag struct {
|
||||
|
||||
// True if the dependency is relinked at runtime.
|
||||
runtimeLinked bool
|
||||
|
||||
// True if the dependency is a toolchain, for example an annotation processor.
|
||||
toolchain bool
|
||||
}
|
||||
|
||||
// installDependencyTag is a dependency tag that is annotated to cause the installed files of the
|
||||
@@ -287,6 +290,8 @@ type installDependencyTag struct {
|
||||
func (d dependencyTag) LicenseAnnotations() []android.LicenseAnnotation {
|
||||
if d.runtimeLinked {
|
||||
return []android.LicenseAnnotation{android.LicenseAnnotationSharedDependency}
|
||||
} else if d.toolchain {
|
||||
return []android.LicenseAnnotation{android.LicenseAnnotationToolchain}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
@@ -329,19 +334,19 @@ var (
|
||||
staticLibTag = dependencyTag{name: "staticlib"}
|
||||
libTag = dependencyTag{name: "javalib", runtimeLinked: true}
|
||||
java9LibTag = dependencyTag{name: "java9lib", runtimeLinked: true}
|
||||
pluginTag = dependencyTag{name: "plugin"}
|
||||
errorpronePluginTag = dependencyTag{name: "errorprone-plugin"}
|
||||
exportedPluginTag = dependencyTag{name: "exported-plugin"}
|
||||
pluginTag = dependencyTag{name: "plugin", toolchain: true}
|
||||
errorpronePluginTag = dependencyTag{name: "errorprone-plugin", toolchain: true}
|
||||
exportedPluginTag = dependencyTag{name: "exported-plugin", toolchain: true}
|
||||
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"}
|
||||
kotlinPluginTag = dependencyTag{name: "kotlin-plugin", toolchain: true}
|
||||
proguardRaiseTag = dependencyTag{name: "proguard-raise"}
|
||||
certificateTag = dependencyTag{name: "certificate"}
|
||||
instrumentationForTag = dependencyTag{name: "instrumentation_for"}
|
||||
extraLintCheckTag = dependencyTag{name: "extra-lint-check"}
|
||||
extraLintCheckTag = dependencyTag{name: "extra-lint-check", toolchain: true}
|
||||
jniLibTag = dependencyTag{name: "jnilib", runtimeLinked: true}
|
||||
syspropPublicStubDepTag = dependencyTag{name: "sysprop public stub"}
|
||||
jniInstallTag = installDependencyTag{name: "jni install"}
|
||||
|
Reference in New Issue
Block a user