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

14
dexpreopt/dexpreopt.go
View File

@@ -102,7 +102,7 @@ func dexpreoptDisabled(global GlobalConfig, module ModuleConfig) bool {
// Don't preopt system server jars that are updatable.
for _, p := range global.UpdatableSystemServerJars {
if _, jar := SplitApexJarPair(p); jar == module.Name {
if _, jar := android.SplitApexJarPair(p); jar == module.Name {
return true
}
}
@@ -536,19 +536,9 @@ func makefileMatch(pattern, s string) bool {
}
}
// 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]
}
// Expected format for apexJarValue = <apex name>:<jar name>
func GetJarLocationFromApexJarPair(apexJarValue string) string {
apex, jar := SplitApexJarPair(apexJarValue)
apex, jar := android.SplitApexJarPair(apexJarValue)
return filepath.Join("/apex", apex, "javalib", jar+".jar")
}