Merge changes from topic "revert-1899703-AMWIVCREEV"

* changes:
  Revert "Build license metadata files in Soong"
  Revert "Add dependency license annotations"
This commit is contained in:
Colin Cross
2021-12-10 23:04:45 +00:00
committed by Gerrit Code Review
11 changed files with 35 additions and 333 deletions

View File

@@ -686,15 +686,6 @@ func (d libraryDependencyTag) static() bool {
return d.Kind == staticLibraryDependency
}
func (d libraryDependencyTag) LicenseAnnotations() []android.LicenseAnnotation {
if d.shared() {
return []android.LicenseAnnotation{android.LicenseAnnotationSharedDependency}
}
return nil
}
var _ android.LicenseAnnotationsDependencyTag = libraryDependencyTag{}
// InstallDepNeeded returns true for shared libraries so that shared library dependencies of
// binaries or other shared libraries are installed as dependencies.
func (d libraryDependencyTag) InstallDepNeeded() bool {