Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 733b1b78 authored by Alix Espino's avatar Alix Espino Committed by Gerrit Code Review
Browse files

Merge "Getting rid of old hacky Libs conversion"

parents 3a79caa3 684f63ab
Loading
Loading
Loading
Loading
+4 −11
Original line number Diff line number Diff line
@@ -2675,18 +2675,11 @@ func (m *Library) convertLibraryAttrsBp2Build(ctx android.TopDownMutatorContext)
	}

	if m.properties.Libs != nil {
		// TODO 244210934 ALIX Check if this else statement breaks presubmits get rid of it if it doesn't
		modType := ctx.ModuleType()
		if strings.HasPrefix(modType, "java_binary") || strings.HasPrefix(modType, "java_library") || modType == "android_app" || modType == "android_library" || modType == "java_plugin" {
		for _, d := range m.properties.Libs {
			neverlinkLabel := android.BazelLabelForModuleDepSingle(ctx, d)
			neverlinkLabel.Label = neverlinkLabel.Label + "-neverlink"
			deps.Add(&neverlinkLabel)
		}

		} else {
			deps.Append(android.BazelLabelForModuleDeps(ctx, android.LastUniqueStrings(android.CopyOf(m.properties.Libs))))
		}
	}

	if m.properties.Static_libs != nil {