diff options
| author | Scott Lobdell <slobdell@google.com> | 2021-07-27 17:02:02 +0000 |
|---|---|---|
| committer | Scott Lobdell <slobdell@google.com> | 2021-07-27 17:02:02 +0000 |
| commit | 055401852b37507878967f14170c383cad9ee9b7 (patch) | |
| tree | ff1093fc45a002f1ab4a975df35de0501226d402 /java/java.go | |
| parent | fb28141c02a8c7c057e83fa4811ba01ac386d385 (diff) | |
| parent | 462e3f481e791916431ccd3cff80047182a8e702 (diff) | |
Merge SP1A.210723.002
Change-Id: Ia2488cb5d7919def03c366d3009fbf2ddc2e26c3
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go index 91eb734c3..5dec3ee3d 100644 --- a/java/java.go +++ b/java/java.go @@ -581,6 +581,10 @@ type librarySdkMemberProperties struct { JarToExport android.Path `android:"arch_variant"` AidlIncludeDirs android.Paths + + // The list of permitted packages that need to be passed to the prebuilts as they are used to + // create the updatable-bcp-packages.txt file. + PermittedPackages []string } func (p *librarySdkMemberProperties) PopulateFromVariant(ctx android.SdkMemberContext, variant android.Module) { @@ -589,6 +593,8 @@ func (p *librarySdkMemberProperties) PopulateFromVariant(ctx android.SdkMemberCo p.JarToExport = ctx.MemberType().(*librarySdkMemberType).jarToExportGetter(ctx, j) p.AidlIncludeDirs = j.AidlIncludeDirs() + + p.PermittedPackages = j.PermittedPackagesForUpdatableBootJars() } func (p *librarySdkMemberProperties) AddToPropertySet(ctx android.SdkMemberContext, propertySet android.BpPropertySet) { @@ -607,6 +613,10 @@ func (p *librarySdkMemberProperties) AddToPropertySet(ctx android.SdkMemberConte propertySet.AddProperty("jars", []string{snapshotRelativeJavaLibPath}) } + if len(p.PermittedPackages) > 0 { + propertySet.AddProperty("permitted_packages", p.PermittedPackages) + } + // Do not copy anything else to the snapshot. if memberType.onlyCopyJarToSnapshot { return @@ -1127,6 +1137,10 @@ type ImportProperties struct { Installable *bool + // If not empty, classes are restricted to the specified packages and their sub-packages. + // This information is used to generate the updatable-bcp-packages.txt file. + Permitted_packages []string + // List of shared java libs that this module has dependencies to Libs []string |