Revert "Add dependency license annotations" am: abe2a4b7bf am: a7fcadce74

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1918943

Change-Id: I48b4bdbcae5cf55b2c7323187e5698a327bb4bd6

cc/cc.go

@@ -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 {

genrule/genrule.go

@@ -110,7 +110,6 @@ type HostToolProvider interface {
 
 type hostToolDependencyTag struct {
 	blueprint.BaseDependencyTag
-	android.LicenseAnnotationToolchainDependencyTag
 	label string
 }
 type generatorProperties struct {

java/java.go

@@ -270,9 +270,6 @@ func (j *Module) InstallBypassMake() bool { return true }
 type dependencyTag struct {
 	blueprint.BaseDependencyTag
 	name string
-
-	// True if the dependency is relinked at runtime.
-	runtimeLinked bool
 }
 
 // installDependencyTag is a dependency tag that is annotated to cause the installed files of the
@@ -283,15 +280,6 @@ type installDependencyTag struct {
 	name string
 }
 
-func (d dependencyTag) LicenseAnnotations() []android.LicenseAnnotation {
-	if d.runtimeLinked {
-		return []android.LicenseAnnotation{android.LicenseAnnotationSharedDependency}
-	}
-	return nil
-}
-
-var _ android.LicenseAnnotationsDependencyTag = dependencyTag{}
-
 type usesLibraryDependencyTag struct {
 	dependencyTag
 
@@ -308,10 +296,7 @@ type usesLibraryDependencyTag struct {
 
 func makeUsesLibraryDependencyTag(sdkVersion int, optional bool, implicit bool) usesLibraryDependencyTag {
 	return usesLibraryDependencyTag{
-		dependencyTag: dependencyTag{
+		dependencyTag: dependencyTag{name: fmt.Sprintf("uses-library-%d", sdkVersion)},
-			name:          fmt.Sprintf("uses-library-%d", sdkVersion),
-			runtimeLinked: true,
-		},
 		sdkVersion:    sdkVersion,
 		optional:      optional,
 		implicit:      implicit,
@@ -325,22 +310,22 @@ func IsJniDepTag(depTag blueprint.DependencyTag) bool {
 var (
 	dataNativeBinsTag       = dependencyTag{name: "dataNativeBins"}
 	staticLibTag            = dependencyTag{name: "staticlib"}
-	libTag                  = dependencyTag{name: "javalib", runtimeLinked: true}
+	libTag                  = dependencyTag{name: "javalib"}
-	java9LibTag             = dependencyTag{name: "java9lib", runtimeLinked: true}
+	java9LibTag             = dependencyTag{name: "java9lib"}
 	pluginTag               = dependencyTag{name: "plugin"}
 	errorpronePluginTag     = dependencyTag{name: "errorprone-plugin"}
 	exportedPluginTag       = dependencyTag{name: "exported-plugin"}
-	bootClasspathTag        = dependencyTag{name: "bootclasspath", runtimeLinked: true}
+	bootClasspathTag        = dependencyTag{name: "bootclasspath"}
-	systemModulesTag        = dependencyTag{name: "system modules", runtimeLinked: true}
+	systemModulesTag        = dependencyTag{name: "system modules"}
 	frameworkResTag         = dependencyTag{name: "framework-res"}
-	kotlinStdlibTag         = dependencyTag{name: "kotlin-stdlib", runtimeLinked: true}
+	kotlinStdlibTag         = dependencyTag{name: "kotlin-stdlib"}
-	kotlinAnnotationsTag    = dependencyTag{name: "kotlin-annotations", runtimeLinked: true}
+	kotlinAnnotationsTag    = dependencyTag{name: "kotlin-annotations"}
 	kotlinPluginTag         = dependencyTag{name: "kotlin-plugin"}
 	proguardRaiseTag        = dependencyTag{name: "proguard-raise"}
 	certificateTag          = dependencyTag{name: "certificate"}
 	instrumentationForTag   = dependencyTag{name: "instrumentation_for"}
 	extraLintCheckTag       = dependencyTag{name: "extra-lint-check"}
-	jniLibTag               = dependencyTag{name: "jnilib", runtimeLinked: true}
+	jniLibTag               = dependencyTag{name: "jnilib"}
 	syspropPublicStubDepTag = dependencyTag{name: "sysprop public stub"}
 	jniInstallTag           = installDependencyTag{name: "jni install"}
 	binaryInstallTag        = installDependencyTag{name: "binary install"}

rust/rust.go

@@ -969,7 +969,6 @@ type dependencyTag struct {
 	name      string
 	library   bool
 	procMacro bool
-	dynamic   bool
 }
 
 // InstallDepNeeded returns true for rlibs, dylibs, and proc macros so that they or their transitive
@@ -980,19 +979,10 @@ func (d dependencyTag) InstallDepNeeded() bool {
 
 var _ android.InstallNeededDependencyTag = dependencyTag{}
 
-func (d dependencyTag) LicenseAnnotations() []android.LicenseAnnotation {
-	if d.library && d.dynamic {
-		return []android.LicenseAnnotation{android.LicenseAnnotationSharedDependency}
-	}
-	return nil
-}
-
-var _ android.LicenseAnnotationsDependencyTag = dependencyTag{}
-
 var (
 	customBindgenDepTag = dependencyTag{name: "customBindgenTag"}
 	rlibDepTag          = dependencyTag{name: "rlibTag", library: true}
-	dylibDepTag         = dependencyTag{name: "dylib", library: true, dynamic: true}
+	dylibDepTag         = dependencyTag{name: "dylib", library: true}
 	procMacroDepTag     = dependencyTag{name: "procMacro", procMacro: true}
 	testPerSrcDepTag    = dependencyTag{name: "rust_unit_tests"}
 	sourceDepTag        = dependencyTag{name: "source"}