StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename UpdatableBootJars to ApexBootJars.

Browse Source 
Note that ART apex boot jars and core-icu4j are exceptions here as they
are not part of ApexBootJars. ART apex boot jars are defined in their
own variable, while core-icu4j is treated as a regular non-updatable
boot jar.

Bug: 191127295
Test: atest CtsClasspathsTestCases
Change-Id: I3cea3d82ef521655a1a5ffa8cae2258ab9d08bfc
This commit is contained in:
satayev
2021-07-21 14:23:52 +01:00
parent ae86338676
commit d604b210c4
18 changed files with 105 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
android/config.go
View File

@@ -1847,16 +1847,16 @@ var earlyBootJarsKey = NewOnceKey("earlyBootJars")
func (c *config) BootJars() []string {
return c.Once(earlyBootJarsKey, func() interface{} {
list := c.productVariables.BootJars.CopyOfJars()
return append(list, c.productVariables.UpdatableBootJars.CopyOfJars()...)
return append(list, c.productVariables.ApexBootJars.CopyOfJars()...)
}).([]string)
}
func (c *config) NonUpdatableBootJars() ConfiguredJarList {
func (c *config) NonApexBootJars() ConfiguredJarList {
return c.productVariables.BootJars
}
func (c *config) UpdatableBootJars() ConfiguredJarList {
return c.productVariables.UpdatableBootJars
func (c *config) ApexBootJars() ConfiguredJarList {
return c.productVariables.ApexBootJars
}
func (c *config) RBEWrapper() string {