Expand the dexpreopt image dependencies to entire image
Instead of just depending on the main .art file (boot.art, etc), also expose the dependencies to the .oat/.vdex files (boot.oat/boot.vdex), and all of the module files that get implicitly loading (boot-ext.*, boot-framework.*, etc) This is necessary for RBE, where the rule only gets the files that it depends upon. Test: treehugger Test: build a system image with RBE Change-Id: I0c7051f18582f1891d3398b46763b1521e4326c8
This commit is contained in:
@@ -132,8 +132,10 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Mo
|
||||
}
|
||||
|
||||
var images android.Paths
|
||||
var imagesDeps []android.Paths
|
||||
for _, arch := range archs {
|
||||
images = append(images, bootImage.images[arch])
|
||||
imagesDeps = append(imagesDeps, bootImage.imagesDeps[arch])
|
||||
}
|
||||
|
||||
dexLocation := android.InstallPathToOnDevicePath(ctx, d.installPath)
|
||||
@@ -173,8 +175,9 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Mo
|
||||
UsesLibraries: d.usesLibs,
|
||||
LibraryPaths: d.libraryPaths,
|
||||
|
||||
Archs: archs,
|
||||
DexPreoptImages: images,
|
||||
Archs: archs,
|
||||
DexPreoptImages: images,
|
||||
DexPreoptImagesDeps: imagesDeps,
|
||||
|
||||
// We use the dex paths and dex locations of the default boot image, as it
|
||||
// contains the full dexpreopt boot classpath. Other images may just contain a subset of
|
||||
|
Reference in New Issue
Block a user