diff options
| author | Paul Duffin <paulduffin@google.com> | 2020-05-29 11:24:51 +0100 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2020-05-29 12:31:41 +0100 |
| commit | e739f1ed9fb7ec7ae269a2615c03d0e44f7dc981 (patch) | |
| tree | 541903c8ff52adffbad301b383efd009f99872dd /java/java.go | |
| parent | 75ab309e3362c255bda39b10c3a3fe18abd5c5bf (diff) | |
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
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go index 162141d83..76bfa86d6 100644 --- a/java/java.go +++ b/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() { |