tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Revert^2 "Do not dexpreopt system server jars from updatable modules.""

Browse source 
am: 565b52610f

Change-Id: I070b02f9f3c29912126cc07029f44e926cd84148
This commit is contained in:
Ulyana Trafimovich 2019-11-27 06:08:38 -08:00 committed by android-build-merger
commit ee40866813
2 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
dexpreopt/dexpreopt.go
View file

@ -102,6 +102,13 @@ func dexpreoptDisabled(global GlobalConfig, module ModuleConfig) bool {
return true
}
// Don't preopt system server jars that are updatable.
for _, p := range global.UpdatableSystemServerJars {
if _, jar := SplitApexJarPair(p); jar == module.Name {
return true
}
}
// If OnlyPreoptBootImageAndSystemServer=true and module is not in boot class path skip
// Also preopt system server jars since selinux prevents system server from loading anything from
// /data. If we don't do this they will need to be extracted which is not favorable for RAM usage
@ -537,6 +544,16 @@ 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]
}
func contains(l []string, s string) bool {
for _, e := range l {
if e == s {

15
java/dexpreopt_config.go
View file

@ -15,7 +15,6 @@
package java
import (
"fmt"
"path/filepath"
"strings"
@ -66,16 +65,6 @@ func setDexpreoptTestGlobalConfig(config android.Config, globalConfig dexpreopt.
var dexpreoptGlobalConfigKey = android.NewOnceKey("DexpreoptGlobalConfig")
var dexpreoptTestGlobalConfigKey = android.NewOnceKey("TestDexpreoptGlobalConfig")
// 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]
}
// systemServerClasspath returns the on-device locations of the modules in the system server classpath. It is computed
// once the first time it is called for any ctx.Config(), and returns the same slice for all future calls with the same
// ctx.Config().
@ -89,9 +78,9 @@ func systemServerClasspath(ctx android.PathContext) []string {
filepath.Join("/system/framework", m+".jar"))
}
for _, m := range global.UpdatableSystemServerJars {
apex, jar := splitApexJarPair(m)
apex, jar := dexpreopt.SplitApexJarPair(m)
systemServerClasspathLocations = append(systemServerClasspathLocations,
filepath.Join("/apex", apex, "javalib", jar + ".jar"))
filepath.Join("/apex", apex, "javalib", jar+".jar"))
}
return systemServerClasspathLocations
})