diff options
| author | Jiyong Park <jiyong@google.com> | 2021-05-20 09:59:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-05-20 09:59:59 +0000 |
| commit | 6fae608181e67f47a3b556850af9bd0c38b7079e (patch) | |
| tree | d29510595fb3ae961d8d4d0a3a09aa346f121ee8 /java/platform_bootclasspath.go | |
| parent | d685b7dcca398473db57fc1c4b1a6528e283ed1d (diff) | |
| parent | 78349b56a06c9578a2da427bc5c4986020c0cc57 (diff) | |
Merge changes I4e7a7ac5,I0c73361b
* changes:
Record the actual APEXes that a module is part of.
Rename InApexes -> InApexVariants
Diffstat (limited to 'java/platform_bootclasspath.go')
| -rw-r--r-- | java/platform_bootclasspath.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/platform_bootclasspath.go b/java/platform_bootclasspath.go index 6ebeb6b89..10bf179d2 100644 --- a/java/platform_bootclasspath.go +++ b/java/platform_bootclasspath.go @@ -225,7 +225,7 @@ func (b *platformBootclasspathModule) checkNonUpdatableModules(ctx android.Modul fromUpdatableApex := apexInfo.Updatable if fromUpdatableApex { // error: this jar is part of an updatable apex - ctx.ModuleErrorf("module %q from updatable apexes %q is not allowed in the framework boot image", ctx.OtherModuleName(m), apexInfo.InApexes) + ctx.ModuleErrorf("module %q from updatable apexes %q is not allowed in the framework boot image", ctx.OtherModuleName(m), apexInfo.InApexVariants) } else { // ok: this jar is part of the platform or a non-updatable apex } |