Merge "Rename dexpreopt.config field to bring it in sync with Make." am: f3f654a764
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1331926 Change-Id: Ic5d5ed1d523d8678279a2e43e991cbf45c29850d
This commit is contained in:
committed by
Automerger Merge Worker
commit
eb30a00be9
@@ -123,10 +123,10 @@ type ModuleConfig struct {
|
|||||||
ProfileIsTextListing bool
|
ProfileIsTextListing bool
|
||||||
ProfileBootListing android.OptionalPath
|
ProfileBootListing android.OptionalPath
|
||||||
|
|
||||||
EnforceUsesLibraries bool
|
EnforceUsesLibraries bool
|
||||||
PresentOptionalUsesLibraries []string
|
OptionalUsesLibraries []string
|
||||||
UsesLibraries []string
|
UsesLibraries []string
|
||||||
LibraryPaths LibraryPaths
|
LibraryPaths LibraryPaths
|
||||||
|
|
||||||
Archs []android.ArchType
|
Archs []android.ArchType
|
||||||
DexPreoptImages []android.Path
|
DexPreoptImages []android.Path
|
||||||
|
@@ -285,7 +285,7 @@ func dexpreoptCommand(ctx android.PathContext, globalSoong *GlobalSoongConfig, g
|
|||||||
|
|
||||||
if module.EnforceUsesLibraries {
|
if module.EnforceUsesLibraries {
|
||||||
// Unconditional class loader context.
|
// Unconditional class loader context.
|
||||||
usesLibs := append(copyOf(module.UsesLibraries), module.PresentOptionalUsesLibraries...)
|
usesLibs := append(copyOf(module.UsesLibraries), module.OptionalUsesLibraries...)
|
||||||
classLoaderContexts.addLibs(anySdkVersion, module, usesLibs...)
|
classLoaderContexts.addLibs(anySdkVersion, module, usesLibs...)
|
||||||
|
|
||||||
// Conditional class loader context for API version < 28.
|
// Conditional class loader context for API version < 28.
|
||||||
|
@@ -44,7 +44,7 @@ func testModuleConfig(ctx android.PathContext, name, partition string) *ModuleCo
|
|||||||
ProfileClassListing: android.OptionalPath{},
|
ProfileClassListing: android.OptionalPath{},
|
||||||
ProfileIsTextListing: false,
|
ProfileIsTextListing: false,
|
||||||
EnforceUsesLibraries: false,
|
EnforceUsesLibraries: false,
|
||||||
PresentOptionalUsesLibraries: nil,
|
OptionalUsesLibraries: nil,
|
||||||
UsesLibraries: nil,
|
UsesLibraries: nil,
|
||||||
LibraryPaths: nil,
|
LibraryPaths: nil,
|
||||||
Archs: []android.ArchType{android.Arm},
|
Archs: []android.ArchType{android.Arm},
|
||||||
|
@@ -193,10 +193,10 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Mo
|
|||||||
ProfileIsTextListing: profileIsTextListing,
|
ProfileIsTextListing: profileIsTextListing,
|
||||||
ProfileBootListing: profileBootListing,
|
ProfileBootListing: profileBootListing,
|
||||||
|
|
||||||
EnforceUsesLibraries: d.enforceUsesLibs,
|
EnforceUsesLibraries: d.enforceUsesLibs,
|
||||||
PresentOptionalUsesLibraries: d.optionalUsesLibs,
|
OptionalUsesLibraries: d.optionalUsesLibs,
|
||||||
UsesLibraries: d.usesLibs,
|
UsesLibraries: d.usesLibs,
|
||||||
LibraryPaths: d.libraryPaths,
|
LibraryPaths: d.libraryPaths,
|
||||||
|
|
||||||
Archs: archs,
|
Archs: archs,
|
||||||
DexPreoptImages: images,
|
DexPreoptImages: images,
|
||||||
|
Reference in New Issue
Block a user