From 39fe574a048ed8c20ae286a62be143f909f5ad02 Mon Sep 17 00:00:00 2001
From: Nicolas Geoffray <ngeoffray@google.com>
Date: Wed, 20 Feb 2019 10:00:47 +0000
Subject: [PATCH] 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
---
 dexpreopt/config.go         | 2 +-
 dexpreopt/dexpreopt_test.go | 2 +-
 java/dexpreopt_bootjars.go  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dexpreopt/config.go b/dexpreopt/config.go
index 0eb162dce..ee3cc8db0 100644
--- a/dexpreopt/config.go
+++ b/dexpreopt/config.go
@@ -36,7 +36,7 @@ type GlobalConfig struct {
 
 	BootJars []string // modules for jars that form the boot class path
 
-	TargetCoreJars                []string // modules for jars that are in the runtime apex
+	RuntimeApexJars               []string // modules for jars that are in the runtime apex
 	ProductUpdatableBootModules   []string
 	ProductUpdatableBootLocations []string
 
diff --git a/dexpreopt/dexpreopt_test.go b/dexpreopt/dexpreopt_test.go
index a2c6f7769..949f91f3a 100644
--- a/dexpreopt/dexpreopt_test.go
+++ b/dexpreopt/dexpreopt_test.go
@@ -29,7 +29,7 @@ var testGlobalConfig = GlobalConfig{
 	PatternsOnSystemOther:              nil,
 	DisableGenerateProfile:             false,
 	BootJars:                           nil,
-	TargetCoreJars:                     nil,
+	RuntimeApexJars:                    nil,
 	ProductUpdatableBootModules:        nil,
 	ProductUpdatableBootLocations:      nil,
 	SystemServerJars:                   nil,
diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go
index 0656ff49a..05868da97 100644
--- a/java/dexpreopt_bootjars.go
+++ b/java/dexpreopt_bootjars.go
@@ -113,7 +113,7 @@ func concat(lists ...[]string) []string {
 }
 
 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)