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

Commit 684f63ab authored by Alix's avatar Alix
Browse files

Getting rid of old hacky Libs conversion 

Now that libs conversion is happening for the needed module_types,
removing if statement with old hacky libs conversion

Test: Presubmit
Bug: 244210934
Change-Id: I92bb2080eeb7dcb85d087a3ff6054bdf8675ec54
parent fbd7fabf

java/java.go

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