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

Merge "Preserve <uses-library> order in dexpreopt.config files."

Browse Source
This commit is contained in:
Ulyana Trafimovich
2021-02-12 10:22:39 +00:00
committed by Gerrit Code Review
parent 7529f06707 65556a87d3
commit da68a045a3
1 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
dexpreopt/class_loader_context.go
View File

@@ -489,20 +489,16 @@ func computeClassLoaderContextRec(clcs []*ClassLoaderContext) (string, string, a
} }
// Class loader contexts that come from Make via JSON dexpreopt.config. JSON CLC representation is // Class loader contexts that come from Make via JSON dexpreopt.config. JSON CLC representation is
// slightly different: it uses a map of library names to their CLC (instead of a list of structs // the same as Soong representation except that SDK versions and paths are represented with strings.
// that including the name, as in the Soong CLC representation). The difference is insubstantial, it
// is caused only by the language differerences between Go and JSON.
type jsonClassLoaderContext struct { type jsonClassLoaderContext struct {
Name string
Host string Host string
Device string Device string
Subcontexts map[string]*jsonClassLoaderContext Subcontexts []*jsonClassLoaderContext
} }
// A map of <uses-library> name to its on-host and on-device build paths and CLC.
type jsonClassLoaderContexts map[string]*jsonClassLoaderContext
// A map from SDK version (represented with a JSON string) to JSON CLCs. // A map from SDK version (represented with a JSON string) to JSON CLCs.
type jsonClassLoaderContextMap map[string]map[string]*jsonClassLoaderContext type jsonClassLoaderContextMap map[string][]*jsonClassLoaderContext
// Convert JSON CLC map to Soong represenation. // Convert JSON CLC map to Soong represenation.
func fromJsonClassLoaderContext(ctx android.PathContext, jClcMap jsonClassLoaderContextMap) ClassLoaderContextMap { func fromJsonClassLoaderContext(ctx android.PathContext, jClcMap jsonClassLoaderContextMap) ClassLoaderContextMap {
@@ -522,11 +518,11 @@ func fromJsonClassLoaderContext(ctx android.PathContext, jClcMap jsonClassLoader
} }
// Recursive helper for fromJsonClassLoaderContext. // Recursive helper for fromJsonClassLoaderContext.
func fromJsonClassLoaderContextRec(ctx android.PathContext, jClcs map[string]*jsonClassLoaderContext) []*ClassLoaderContext { func fromJsonClassLoaderContextRec(ctx android.PathContext, jClcs []*jsonClassLoaderContext) []*ClassLoaderContext {
clcs := make([]*ClassLoaderContext, 0, len(jClcs)) clcs := make([]*ClassLoaderContext, 0, len(jClcs))
for lib, clc := range jClcs { for _, clc := range jClcs {
clcs = append(clcs, &ClassLoaderContext{ clcs = append(clcs, &ClassLoaderContext{
Name: lib, Name: clc.Name,
Host: constructPath(ctx, clc.Host), Host: constructPath(ctx, clc.Host),
Device: clc.Device, Device: clc.Device,
Subcontexts: fromJsonClassLoaderContextRec(ctx, clc.Subcontexts), Subcontexts: fromJsonClassLoaderContextRec(ctx, clc.Subcontexts),
@@ -546,14 +542,15 @@ func toJsonClassLoaderContext(clcMap ClassLoaderContextMap) jsonClassLoaderConte
} }
// Recursive helper for toJsonClassLoaderContext. // Recursive helper for toJsonClassLoaderContext.
func toJsonClassLoaderContextRec(clcs []*ClassLoaderContext) map[string]*jsonClassLoaderContext { func toJsonClassLoaderContextRec(clcs []*ClassLoaderContext) []*jsonClassLoaderContext {
jClcs := make(map[string]*jsonClassLoaderContext, len(clcs)) jClcs := make([]*jsonClassLoaderContext, len(clcs))
for _, clc := range clcs { for _, clc := range clcs {
jClcs[clc.Name] = &jsonClassLoaderContext{ jClcs = append(jClcs, &jsonClassLoaderContext{
Name: clc.Name,
Host: clc.Host.String(), Host: clc.Host.String(),
Device: clc.Device, Device: clc.Device,
Subcontexts: toJsonClassLoaderContextRec(clc.Subcontexts), Subcontexts: toJsonClassLoaderContextRec(clc.Subcontexts),
} })
} }
return jClcs return jClcs
} }