Merge "Workaround to make AlwaysUsePrebuiltSdks() work with platform_bootclasspath"

2021-05-20 06:58:34 +00:00
parent 6333b0e460 7487a7abb6
commit 40aa4363cb
5 changed files with 176 additions and 5 deletions
--- a/java/dexpreopt_bootjars.go
+++ b/java/dexpreopt_bootjars.go
@@ -766,7 +766,7 @@ func generateUpdatableBcpPackagesRule(ctx android.ModuleContext, image *bootImag
 			if len(pp) > 0 {
 				updatablePackages = append(updatablePackages, pp...)
 			} else {
-				ctx.ModuleErrorf("Missing permitted_packages")
+				ctx.OtherModuleErrorf(module, "Missing permitted_packages")
 			}
 		}
 	}