diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-15 03:02:34 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-15 03:02:34 +0000 |
commit | 8c4e4ad32eca921f8067ea4f3b3ec58d3b827b21 (patch) | |
tree | a36c1dd852c3b9c2e03fa9d66c4203881779e00f | |
parent | 851fa4c291f47e827841e89987caae246c686661 (diff) | |
parent | f489589521d7da053814438b0bf3dc379239118a (diff) | |
download | build_soong-8c4e4ad32eca921f8067ea4f3b3ec58d3b827b21.tar.gz build_soong-8c4e4ad32eca921f8067ea4f3b3ec58d3b827b21.tar.bz2 build_soong-8c4e4ad32eca921f8067ea4f3b3ec58d3b827b21.zip |
Snap for 5567188 from f489589521d7da053814438b0bf3dc379239118a to qt-release
Change-Id: I2a65858e6d9b4a8385af1207783e60f8300ba434
-rw-r--r-- | java/dexpreopt_config.go | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/java/dexpreopt_config.go b/java/dexpreopt_config.go index 409b4b1f..abc5fa18 100644 --- a/java/dexpreopt_config.go +++ b/java/dexpreopt_config.go @@ -136,21 +136,29 @@ func apexBootImageConfig(ctx android.PathContext) bootImageConfig { global := dexpreoptGlobalConfig(ctx) runtimeModules := global.RuntimeApexJars + nonFrameworkModules := concat(runtimeModules, global.ProductUpdatableBootModules) + frameworkModules := android.RemoveListFromList(global.BootJars, nonFrameworkModules) + imageModules := concat(runtimeModules, frameworkModules) - var runtimeBootLocations []string + var bootLocations []string for _, m := range runtimeModules { - runtimeBootLocations = append(runtimeBootLocations, + bootLocations = append(bootLocations, filepath.Join("/apex/com.android.runtime/javalib", m+".jar")) } + for _, m := range frameworkModules { + bootLocations = append(bootLocations, + filepath.Join("/system/framework", m+".jar")) + } + // The path to bootclasspath dex files needs to be known at module GenerateAndroidBuildAction time, before // the bootclasspath modules have been compiled. Set up known paths for them, the singleton rules will copy // them there. // TODO: use module dependencies instead - var runtimeBootDexPaths android.WritablePaths - for _, m := range runtimeModules { - runtimeBootDexPaths = append(runtimeBootDexPaths, + var bootDexPaths android.WritablePaths + for _, m := range imageModules { + bootDexPaths = append(bootDexPaths, android.PathForOutput(ctx, ctx.Config().DeviceName(), "dex_apexjars_input", m+".jar")) } @@ -165,9 +173,9 @@ func apexBootImageConfig(ctx android.PathContext) bootImageConfig { return bootImageConfig{ name: "apex", - modules: runtimeModules, - dexLocations: runtimeBootLocations, - dexPaths: runtimeBootDexPaths, + modules: imageModules, + dexLocations: bootLocations, + dexPaths: bootDexPaths, dir: dir, symbolsDir: symbolsDir, images: images, |