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

Commit f3f654a7 authored by Ulyana Trafimovich's avatar Ulyana Trafimovich Committed by Gerrit Code Review
Browse files

Merge "Rename dexpreopt.config field to bring it in sync with Make."

parents 000aef69 6e82748b

dexpreopt/config.go

+4 −4
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ type ModuleConfig struct { 
	ProfileBootListing   android.OptionalPath



	EnforceUsesLibraries  bool

	PresentOptionalUsesLibraries []string

	OptionalUsesLibraries []string

	UsesLibraries         []string

	LibraryPaths          LibraryPaths

dexpreopt/dexpreopt.go

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ func dexpreoptCommand(ctx android.PathContext, globalSoong *GlobalSoongConfig, g 


	if module.EnforceUsesLibraries {

		// Unconditional class loader context.

		usesLibs := append(copyOf(module.UsesLibraries), module.PresentOptionalUsesLibraries...)

		usesLibs := append(copyOf(module.UsesLibraries), module.OptionalUsesLibraries...)

		classLoaderContexts.addLibs(anySdkVersion, module, usesLibs...)



		// Conditional class loader context for API version < 28.

dexpreopt/dexpreopt_test.go

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ func testModuleConfig(ctx android.PathContext, name, partition string) *ModuleCo 
		ProfileClassListing:             android.OptionalPath{},

		ProfileIsTextListing:            false,

		EnforceUsesLibraries:            false,

		PresentOptionalUsesLibraries:    nil,

		OptionalUsesLibraries:           nil,

		UsesLibraries:                   nil,

		LibraryPaths:                    nil,

		Archs:                           []android.ArchType{android.Arm},

java/dexpreopt.go

+4 −4
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Mo 
		ProfileBootListing:   profileBootListing,



		EnforceUsesLibraries:  d.enforceUsesLibs,

		PresentOptionalUsesLibraries: d.optionalUsesLibs,

		OptionalUsesLibraries: d.optionalUsesLibs,

		UsesLibraries:         d.usesLibs,

		LibraryPaths:          d.libraryPaths,