Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f96d844 authored by Ulyana Trafimovich's avatar Ulyana Trafimovich Committed by Automerger Merge Worker
Browse files

Merge "Defer dexpreopt failure with missing implementation jar" am: 9d373d8c

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1849413

Change-Id: Iee2b931d37923fe823905e16a144dd8c5c9de862
parents bba5a387 9d373d8c
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -598,11 +598,18 @@ func toJsonClassLoaderContext(clcMap ClassLoaderContextMap) jsonClassLoaderConte
func toJsonClassLoaderContextRec(clcs []*ClassLoaderContext) []*jsonClassLoaderContext {
	jClcs := make([]*jsonClassLoaderContext, len(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{
			Name:        clc.Name,
			Optional:    clc.Optional,
			Implicit:    clc.Implicit,
			Host:        clc.Host.String(),
			Host:        host,
			Device:      clc.Device,
			Subcontexts: toJsonClassLoaderContextRec(clc.Subcontexts),
		}