diff options
| author | Martin Stjernholm <mast@google.com> | 2021-05-21 19:22:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-05-21 19:22:15 +0000 |
| commit | f7a62e6c7383dceafb968adf3fdab7801840d772 (patch) | |
| tree | c79e6e15f0659070aac0df34baa86b8234853b2c /java/platform_bootclasspath.go | |
| parent | 55d7ed4bbfd3410188617f004624f12dc24b4549 (diff) | |
| parent | 59b9f141739e5c0e852c741f6f809121a90fc228 (diff) | |
Merge changes I4e7a7ac5,I0c73361b into sc-dev
* 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 42bf0c238..5db2efe40 100644 --- a/java/platform_bootclasspath.go +++ b/java/platform_bootclasspath.go @@ -218,7 +218,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 } |