diff options
Diffstat (limited to 'java/dexpreopt_config.go')
| -rw-r--r-- | java/dexpreopt_config.go | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/java/dexpreopt_config.go b/java/dexpreopt_config.go index 117b660b7..76c78cb29 100644 --- a/java/dexpreopt_config.go +++ b/java/dexpreopt_config.go @@ -44,8 +44,6 @@ var ( bootImageConfigRawKey = android.NewOnceKey("bootImageConfigRaw") artBootImageName = "art" frameworkBootImageName = "boot" - mainlineBootImageName = "mainline" - bootImageStem = "boot" ) func genBootImageConfigRaw(ctx android.PathContext) map[string]*bootImageConfig { @@ -54,16 +52,14 @@ func genBootImageConfigRaw(ctx android.PathContext) map[string]*bootImageConfig artModules := global.ArtApexJars frameworkModules := global.BootJars.RemoveList(artModules) - mainlineBcpModules := global.ApexBootJars - frameworkSubdir := "system/framework" // ART config for the primary boot image in the ART apex. // It includes the Core Libraries. artCfg := bootImageConfig{ name: artBootImageName, - stem: bootImageStem, + stem: "boot", installDirOnHost: "apex/art_boot_images/javalib", - installDirOnDevice: frameworkSubdir, + installDirOnDevice: "system/framework", profileInstallPathInApex: "etc/boot-image.prof", modules: artModules, preloadedClassesFile: "art/build/boot/preloaded-classes", @@ -72,10 +68,11 @@ func genBootImageConfigRaw(ctx android.PathContext) map[string]*bootImageConfig // Framework config for the boot image extension. // It includes framework libraries and depends on the ART config. + frameworkSubdir := "system/framework" frameworkCfg := bootImageConfig{ extends: &artCfg, name: frameworkBootImageName, - stem: bootImageStem, + stem: "boot", installDirOnHost: frameworkSubdir, installDirOnDevice: frameworkSubdir, modules: frameworkModules, @@ -83,20 +80,9 @@ func genBootImageConfigRaw(ctx android.PathContext) map[string]*bootImageConfig compilerFilter: "speed-profile", } - mainlineCfg := bootImageConfig{ - extends: &frameworkCfg, - name: mainlineBootImageName, - stem: bootImageStem, - installDirOnHost: frameworkSubdir, - installDirOnDevice: frameworkSubdir, - modules: mainlineBcpModules, - compilerFilter: "verify", - } - return map[string]*bootImageConfig{ artBootImageName: &artCfg, frameworkBootImageName: &frameworkCfg, - mainlineBootImageName: &mainlineCfg, } }).(map[string]*bootImageConfig) } @@ -188,10 +174,6 @@ func defaultBootImageConfig(ctx android.PathContext) *bootImageConfig { return genBootImageConfigs(ctx)[frameworkBootImageName] } -func mainlineBootImageConfig(ctx android.PathContext) *bootImageConfig { - return genBootImageConfigs(ctx)[mainlineBootImageName] -} - // Apex boot config allows to access build/install paths of apex boot jars without going // through the usual trouble of registering dependencies on those modules and extracting build paths // from those dependencies. |