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

Commit d37fb538 authored by Paul Duffin's avatar Paul Duffin Committed by Automerger Merge Worker
Browse files

Merge "Remove unnecessary work around for updatable-media" into tm-dev am: 5ec5a80c

parents 0b0910f4 5ec5a80c
Loading
Loading
Loading
Loading
+0 −6
Original line number Original line Diff line number Diff line
@@ -208,12 +208,6 @@ func createMergedFrameworkImpl(ctx android.LoadHookContext, modules []string) {
	props := libraryProps{}
	props := libraryProps{}
	props.Name = proptools.StringPtr("all-framework-module-impl")
	props.Name = proptools.StringPtr("all-framework-module-impl")
	props.Static_libs = transformArray(modules, "", ".impl")
	props.Static_libs = transformArray(modules, "", ".impl")
	// Media module's impl jar is called "updatable-media"
	for i, v := range props.Static_libs {
		if v == "framework-media.impl" {
			props.Static_libs[i] = "updatable-media"
		}
	}
	props.Sdk_version = proptools.StringPtr("module_current")
	props.Sdk_version = proptools.StringPtr("module_current")
	props.Visibility = []string{"//frameworks/base"}
	props.Visibility = []string{"//frameworks/base"}
	ctx.CreateModule(java.LibraryFactory, &props)
	ctx.CreateModule(java.LibraryFactory, &props)