openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add system server jars expressed in make in the system server classpath. 

This was missed in:
https://android-review.googlesource.com/c/platform/build/soong/+/1180134

Test: lunch and build ARC, check SYSTEMSERVERCLASSPATH
Bug: 148944771
Bug: 141785760
Bug: 140451054
Change-Id: I619aee5441f7233010067a6c780e978f38ba7796
This commit is contained in:
Nicolas Geoffray 2020-02-17 14:55:06 +00:00
parent 954b29728d
commit 47cbfcdd3e
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
java/dexpreopt_config.go
View File

@ -15,6 +15,7 @@
package java
import (
"fmt"
"path/filepath"
"strings"
@ -29,14 +30,29 @@ func systemServerClasspath(ctx android.MakeVarsContext) []string {
return ctx.Config().OnceStringSlice(systemServerClasspathKey, func() []string {
global := dexpreopt.GetGlobalConfig(ctx)
var systemServerClasspathLocations []string
for _, m := range *DexpreoptedSystemServerJars(ctx.Config()) {
var dexpreoptJars = *DexpreoptedSystemServerJars(ctx.Config())
// 1) The jars that are dexpreopted.
for _, m := range dexpreoptJars {
systemServerClasspathLocations = append(systemServerClasspathLocations,
filepath.Join("/system/framework", m+".jar"))
}
// 2) The jars that are from an updatable apex.
for _, m := range global.UpdatableSystemServerJars {
systemServerClasspathLocations = append(systemServerClasspathLocations,
dexpreopt.GetJarLocationFromApexJarPair(m))
}
// 3) The jars from make (which are not updatable, not preopted).
for _, m := range dexpreopt.NonUpdatableSystemServerJars(ctx, global) {
if !android.InList(m, dexpreoptJars) {
systemServerClasspathLocations = append(systemServerClasspathLocations,
filepath.Join("/system/framework", m+".jar"))
}
}
if len(systemServerClasspathLocations) != len(global.SystemServerJars)+len(global.UpdatableSystemServerJars) {
panic(fmt.Errorf("Wrong number of system server jars, got %d, expected %d",
len(systemServerClasspathLocations),
len(global.SystemServerJars)+len(global.UpdatableSystemServerJars)))
}
return systemServerClasspathLocations
})
}