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

Make PRODUCT_BOOT_JARS and PRODUCT_UPDATABLE_BOOT_JARS disjoint.

Browse Source 
This is to unify boot jars with system server jars:
PRODUCT_SYSTEM_SERVER_JARS and PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS
do not overlap.

Test: aosp_walleye-userdebug boots

Exempt-From-Owner-Approval: cherry-pick.
Bug: 146363577
Change-Id: If001049a46f8e9d38921dabeedbd61e971ebfe73
Merged-In: If001049a46f8e9d38921dabeedbd61e971ebfe73
(cherry picked from commit ef4358e536)
This commit is contained in:
Ulya Trafimovich
2020-02-10 15:29:28 +00:00
committed by Ulyana Trafimovich
parent 4e29184a4e
commit 4cdada2d1f
4 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
android/config.go
View File

@@ -923,8 +923,23 @@ func (c *config) ModulesLoadedByPrivilegedModules() []string {
return c.productVariables.ModulesLoadedByPrivilegedModules
}
// Expected format for apexJarValue = <apex name>:<jar name>
func SplitApexJarPair(apexJarValue string) (string, string) {
var apexJarPair []string = strings.SplitN(apexJarValue, ":", 2)
if apexJarPair == nil || len(apexJarPair) != 2 {
panic(fmt.Errorf("malformed apexJarValue: %q, expected format: <apex>:<jar>",
apexJarValue))
}
return apexJarPair[0], apexJarPair[1]
}
func (c *config) BootJars() []string {
return c.productVariables.BootJars
jars := c.productVariables.BootJars
for _, p := range c.productVariables.UpdatableBootJars {
_, jar := SplitApexJarPair(p)
jars = append(jars, jar)
}
return jars
}
func (c *config) DexpreoptGlobalConfig(ctx PathContext) ([]byte, error) {