Merge SP1A.210803.001

Change-Id: Ia3abf30c22f1b40f53fb4ffba670c8015413b1c0

2 files changed, 12 insertions, 0 deletions

diff --git a/java/java.go b/java/java.go
index 5dec3ee3d..84a9d9aa4 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1193,6 +1193,12 @@ type Import struct {
 	minSdkVersion android.SdkSpec
 }
 
+var _ PermittedPackagesForUpdatableBootJars = (*Import)(nil)
+
+func (j *Import) PermittedPackagesForUpdatableBootJars() []string {
+	return j.properties.Permitted_packages
+}
+
 func (j *Import) SdkVersion(ctx android.EarlyModuleContext) android.SdkSpec {
 	return android.SdkSpecFrom(ctx, String(j.properties.Sdk_version))
 }
diff --git a/java/sdk_library.go b/java/sdk_library.go
index 0a24dc9f3..fe48e6144 100644
--- a/java/sdk_library.go
+++ b/java/sdk_library.go
@@ -1995,6 +1995,12 @@ func sdkLibraryImportFactory() android.Module {
 	return module
 }
 
+var _ PermittedPackagesForUpdatableBootJars = (*SdkLibraryImport)(nil)
+
+func (module *SdkLibraryImport) PermittedPackagesForUpdatableBootJars() []string {
+	return module.properties.Permitted_packages
+}
+
 func (module *SdkLibraryImport) Prebuilt() *android.Prebuilt {
 	return &module.prebuilt
 }