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

Merge changes I4e7a7ac5,I0c73361b into sc-dev

Browse Source 
* changes:
  Record the actual APEXes that a module is part of.
  Rename InApexes -> InApexVariants
This commit is contained in:
Martin Stjernholm
2021-05-21 19:22:15 +00:00
committed by Android (Google) Code Review
parent 55d7ed4bbf 59b9f14173
commit f7a62e6c73
10 changed files with 104 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/platform_bootclasspath.go
View File

@@ -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
}