Revert^2 "Use boot image extension for framework libraries."
This reverts commit 3fae7662eeb6eb158f1efeb20bb444cf3d723ed4
Reason: re-applying the change after resolving the problem with
coverage builds (in a related CL).
Use boot image extension for framework libraries.
This patch splits the system boot image in two parts:
- The ART boot image. This is the primary boot image that is
included in the ART apex and contains dexpreopted Core Libraries.
- The framwework boot image extension. It depends on the ART boot
image and contains framework libraries.
The third "apex" boot image (used in the JIT-zygote experiment)
remains unchanged; it is a monolithic primary boot image that
contains both libcore and framework libraries.
Dexpreopting of APKs now uses the framework boot image extension
(which in turn pulls in the ART boot image as a dependency).
Bug: 146462581
Bug: 119800099
Test: aosp_walleye-userdebug boots.
Change-Id: I06c5ac5fca011fa639ed208735462ab32451df3a
diff --git a/java/dexpreopt_config.go b/java/dexpreopt_config.go
index 35748b8..8749a7d 100644
--- a/java/dexpreopt_config.go
+++ b/java/dexpreopt_config.go
@@ -167,15 +167,15 @@
}
// Framework config for the boot image extension.
- // It includes both the Core libraries and framework.
+ // It includes framework libraries and depends on the ART config.
frameworkCfg := bootImageConfig{
- extension: false,
+ extension: true,
name: frameworkBootImageName,
stem: "boot",
installSubdir: frameworkSubdir,
- modules: concat(artModules, frameworkModules),
- dexLocations: concat(artLocations, frameworkLocations),
- dexLocationsDeps: concat(artLocations, frameworkLocations),
+ modules: frameworkModules,
+ dexLocations: frameworkLocations,
+ dexLocationsDeps: append(artLocations, frameworkLocations...),
}
// Apex config for the boot image used in the JIT-zygote experiment.
@@ -231,6 +231,10 @@
c.zip = c.dir.Join(ctx, c.name+".zip")
}
+ // specific to the framework config
+ frameworkCfg.dexPathsDeps = append(artCfg.dexPathsDeps, frameworkCfg.dexPathsDeps...)
+ frameworkCfg.imageLocations = append(artCfg.imageLocations, frameworkCfg.imageLocations...)
+
return configs
}).(map[string]*bootImageConfig)
}