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

Merge "Defer dexpreopt failure with missing implementation jar"

Browse Source
This commit is contained in:
Ulyana Trafimovich
2021-10-07 11:39:59 +00:00
committed by Gerrit Code Review
parent 2937eb5bb4 77a80fa397
commit 9d373d8cb0
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dexpreopt/class_loader_context.go
View File

@@ -598,11 +598,18 @@ func toJsonClassLoaderContext(clcMap ClassLoaderContextMap) jsonClassLoaderConte
func toJsonClassLoaderContextRec(clcs []*ClassLoaderContext) []*jsonClassLoaderContext { func toJsonClassLoaderContextRec(clcs []*ClassLoaderContext) []*jsonClassLoaderContext {
jClcs := make([]*jsonClassLoaderContext, len(clcs)) jClcs := make([]*jsonClassLoaderContext, len(clcs))
for i, clc := range clcs { for i, clc := range clcs {
var host string
if clc.Host == nil {
// Defer build failure to when this CLC is actually used.
host = fmt.Sprintf("implementation-jar-for-%s-is-not-available.jar", clc.Name)
} else {
host = clc.Host.String()
}
jClcs[i] = &jsonClassLoaderContext{ jClcs[i] = &jsonClassLoaderContext{
Name: clc.Name, Name: clc.Name,
Optional: clc.Optional, Optional: clc.Optional,
Implicit: clc.Implicit, Implicit: clc.Implicit,
Host: clc.Host.String(), Host: host,
Device: clc.Device, Device: clc.Device,
Subcontexts: toJsonClassLoaderContextRec(clc.Subcontexts), Subcontexts: toJsonClassLoaderContextRec(clc.Subcontexts),
} }