commit 39fe574a048ed8c20ae286a62be143f909f5ad02
author Nicolas Geoffray <ngeoffray@google.com> Wed Feb 20 10:00:47 2019 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Wed Feb 20 10:00:47 2019 +0000
tree 50671c2516f2b106ffa07828a38033a086ea7126
parent e0233a5bdd560ad567dc716990ab17c3fe0c5a4f

Set a dedicated variable for the runtime apex libs.

Bug: 124789867
Test: build with coverage, the boot classpath has jacoco.jar in /system/framework, not the apex
Change-Id: Iaa0762b5a674282be95710d0e1fb166a58ec893b

java/dexpreopt_bootjars.go

diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go
index 0656ff4..05868da 100644
--- a/java/dexpreopt_bootjars.go
+++ b/java/dexpreopt_bootjars.go
@@ -113,7 +113,7 @@
 }
 
 func computeBootClasspath(ctx android.PathContext, info *bootJarsInfo) {
-	runtimeModules := android.RemoveListFromList(info.global.TargetCoreJars, info.global.ProductUpdatableBootModules)
+	runtimeModules := info.global.RuntimeApexJars
 	nonFrameworkModules := concat(runtimeModules, info.global.ProductUpdatableBootModules)
 	frameworkModules := android.RemoveListFromList(info.global.BootJars, nonFrameworkModules)