soong: Align update boot jar variable with system_server jar

Use apex:jar pair values for updatable boot jars to align with
updatable system_server values.

Test: Compiles & flashed device. Ensured that the bootclasspath & system_server class
paths remain the same.

Change-Id: I1d6dfe3325d9091b7c724458be4e6471f9086666
This commit is contained in:
Roshan Pius
2019-11-27 09:37:46 -08:00
parent bf857716a1
commit ccc26ef316
3 changed files with 26 additions and 10 deletions

View File

@@ -38,11 +38,10 @@ type GlobalConfig struct {
DisableGenerateProfile bool // don't generate profiles
ProfileDir string // directory to find profiles in
BootJars []string // modules for jars that form the boot class path
BootJars []string // modules for jars that form the boot class path
UpdatableBootJars []string // jars within apex that form the boot class path
ArtApexJars []string // modules for jars that are in the ART APEX
ProductUpdatableBootModules []string
ProductUpdatableBootLocations []string
ArtApexJars []string // modules for jars that are in the ART APEX
SystemServerJars []string // jars that form the system server
SystemServerApps []string // apps that are loaded into system server
@@ -281,9 +280,8 @@ func GlobalConfigForTests(ctx android.PathContext) GlobalConfig {
DisableGenerateProfile: false,
ProfileDir: "",
BootJars: nil,
UpdatableBootJars: nil,
ArtApexJars: nil,
ProductUpdatableBootModules: nil,
ProductUpdatableBootLocations: nil,
SystemServerJars: nil,
SystemServerApps: nil,
UpdatableSystemServerJars: nil,