diff options
| -rw-r--r-- | dexpreopt/config.go | 8 | ||||
| -rw-r--r-- | dexpreopt/dexpreopt.go | 2 | ||||
| -rw-r--r-- | dexpreopt/dexpreopt_test.go | 2 | ||||
| -rw-r--r-- | java/dexpreopt.go | 8 |
4 files changed, 10 insertions, 10 deletions
diff --git a/dexpreopt/config.go b/dexpreopt/config.go index 3440f8ee6..bc44b2101 100644 --- a/dexpreopt/config.go +++ b/dexpreopt/config.go @@ -123,10 +123,10 @@ type ModuleConfig struct { ProfileIsTextListing bool ProfileBootListing android.OptionalPath - EnforceUsesLibraries bool - PresentOptionalUsesLibraries []string - UsesLibraries []string - LibraryPaths LibraryPaths + EnforceUsesLibraries bool + OptionalUsesLibraries []string + UsesLibraries []string + LibraryPaths LibraryPaths Archs []android.ArchType DexPreoptImages []android.Path diff --git a/dexpreopt/dexpreopt.go b/dexpreopt/dexpreopt.go index 57a9250b6..9cbe6e591 100644 --- a/dexpreopt/dexpreopt.go +++ b/dexpreopt/dexpreopt.go @@ -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. diff --git a/dexpreopt/dexpreopt_test.go b/dexpreopt/dexpreopt_test.go index d23999328..ec3154903 100644 --- a/dexpreopt/dexpreopt_test.go +++ b/dexpreopt/dexpreopt_test.go @@ -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}, diff --git a/java/dexpreopt.go b/java/dexpreopt.go index c33415ef6..7f1afd667 100644 --- a/java/dexpreopt.go +++ b/java/dexpreopt.go @@ -193,10 +193,10 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Mo ProfileIsTextListing: profileIsTextListing, ProfileBootListing: profileBootListing, - EnforceUsesLibraries: d.enforceUsesLibs, - PresentOptionalUsesLibraries: d.optionalUsesLibs, - UsesLibraries: d.usesLibs, - LibraryPaths: d.libraryPaths, + EnforceUsesLibraries: d.enforceUsesLibs, + OptionalUsesLibraries: d.optionalUsesLibs, + UsesLibraries: d.usesLibs, + LibraryPaths: d.libraryPaths, Archs: archs, DexPreoptImages: images, |