Rename fields in dexpreopt config
Add 'host' into the name of fields regarding path on the host side to distinguish between paths on the device(which will be added in the following commit), and paths on the host. Bug: 158843648 Test: build and flash, and then adb wait-for-device \ && adb -s $S root \ && adb -s $S logcat \ | grep -E 'ClassLoaderContext [a-z ]+ mismatch' -C 1 Change-Id: Ib2645ed51591ba2f4b726c115b401ad2bd6675da
This commit is contained in:
@@ -180,11 +180,11 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Wr
|
||||
for _, target := range targets {
|
||||
archs = append(archs, target.Arch.ArchType)
|
||||
variant := bootImage.getVariant(target)
|
||||
images = append(images, variant.images)
|
||||
images = append(images, variant.imagePathOnHost)
|
||||
imagesDeps = append(imagesDeps, variant.imagesDeps)
|
||||
}
|
||||
// The image locations for all Android variants are identical.
|
||||
imageLocations := bootImage.getAnyAndroidVariant().imageLocations()
|
||||
hostImageLocations := bootImage.getAnyAndroidVariant().imageLocations()
|
||||
|
||||
var profileClassListing android.OptionalPath
|
||||
var profileBootListing android.OptionalPath
|
||||
@@ -224,9 +224,9 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Wr
|
||||
ProvidesUsesLibrary: providesUsesLib,
|
||||
ClassLoaderContexts: d.classLoaderContexts,
|
||||
|
||||
Archs: archs,
|
||||
DexPreoptImagesDeps: imagesDeps,
|
||||
DexPreoptImageLocations: imageLocations,
|
||||
Archs: archs,
|
||||
DexPreoptImagesDeps: imagesDeps,
|
||||
DexPreoptImageLocationsOnHost: hostImageLocations,
|
||||
|
||||
PreoptBootClassPathDexFiles: dexFiles.Paths(),
|
||||
PreoptBootClassPathDexLocations: dexLocations,
|
||||
|
Reference in New Issue
Block a user