diff options
| author | 2021-05-07 18:53:21 +0900 | |
|---|---|---|
| committer | 2021-05-07 21:40:23 +0900 | |
| commit | a596909342e7751f3c710efc26f2c5fe5a84ced0 (patch) | |
| tree | 4330822146021a505e8e10368b3736f2a78804e4 /java/dexpreopt.go | |
| parent | 882bcc1c1cf4af1c3712c7d9c4fea315a8a8d08d (diff) | |
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
Diffstat (limited to 'java/dexpreopt.go')
| -rw-r--r-- | java/dexpreopt.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/java/dexpreopt.go b/java/dexpreopt.go index 0020a2d92..ef3ca2c35 100644 --- a/java/dexpreopt.go +++ b/java/dexpreopt.go @@ -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, |