Collect permitted packages from java_sdk_library instances
Switching an updatable boot jar from java_library to java_sdk_library changed the contents of the updatable-bcp-packages.txt due to the code requiring the module to be *Library. This change updates that to allow it to be any module that implements the PermittedPackagesForUpdatableBootJars interface which is *Library and anything that embeds that like *SdkLibrary. Bug: 155164730 Test: m droid and check the contents of system/etc/updatable-bcp-packages.txt Change-Id: I464af74628da311734f102f77ec8158daec5b32d
This commit is contained in:
11
java/java.go
11
java/java.go
@@ -1840,6 +1840,17 @@ type Library struct {
|
||||
InstallMixin func(ctx android.ModuleContext, installPath android.Path) (extraInstallDeps android.Paths)
|
||||
}
|
||||
|
||||
// Provides access to the list of permitted packages from updatable boot jars.
|
||||
type PermittedPackagesForUpdatableBootJars interface {
|
||||
PermittedPackagesForUpdatableBootJars() []string
|
||||
}
|
||||
|
||||
var _ PermittedPackagesForUpdatableBootJars = (*Library)(nil)
|
||||
|
||||
func (j *Library) PermittedPackagesForUpdatableBootJars() []string {
|
||||
return j.properties.Permitted_packages
|
||||
}
|
||||
|
||||
func shouldUncompressDex(ctx android.ModuleContext, dexpreopter *dexpreopter) bool {
|
||||
// Store uncompressed (and aligned) any dex files from jars in APEXes.
|
||||
if am, ok := ctx.Module().(android.ApexModule); ok && !am.IsForPlatform() {
|
||||
|
Reference in New Issue
Block a user