Merge "Propagate permitted packages to sdk snapshot" am: 81d56dcd3f am: fcbeaa37a8

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1768128

Change-Id: I71487b6536f93a0dbbf121ff45f5737858f3d373
This commit is contained in:
Paul Duffin
2021-07-15 15:23:17 +00:00
committed by Automerger Merge Worker
4 changed files with 40 additions and 0 deletions

View File

@@ -346,6 +346,7 @@ java_import {
visibility: ["//visibility:public"],
apex_available: ["myapex"],
jars: ["java/mybootlib.jar"],
permitted_packages: ["mybootlib"],
}
java_sdk_library_import {
@@ -355,6 +356,7 @@ java_sdk_library_import {
apex_available: ["myapex"],
shared_library: true,
compile_dex: true,
permitted_packages: ["myothersdklibrary"],
public: {
jars: ["sdk_library/public/myothersdklibrary-stubs.jar"],
stub_srcs: ["sdk_library/public/myothersdklibrary_stub_sources"],
@@ -428,6 +430,7 @@ java_import {
visibility: ["//visibility:public"],
apex_available: ["myapex"],
jars: ["java/mybootlib.jar"],
permitted_packages: ["mybootlib"],
}
java_sdk_library_import {
@@ -437,6 +440,7 @@ java_sdk_library_import {
apex_available: ["myapex"],
shared_library: true,
compile_dex: true,
permitted_packages: ["myothersdklibrary"],
public: {
jars: ["sdk_library/public/myothersdklibrary-stubs.jar"],
stub_srcs: ["sdk_library/public/myothersdklibrary_stub_sources"],
@@ -798,6 +802,7 @@ func TestSnapshotWithBootclasspathFragment_HiddenAPI(t *testing.T) {
srcs: ["Test.java"],
compile_dex: true,
public: {enabled: true},
permitted_packages: ["mysdklibrary"],
}
`),
).RunTest(t)
@@ -841,6 +846,7 @@ java_import {
visibility: ["//visibility:public"],
apex_available: ["myapex"],
jars: ["java/mybootlib.jar"],
permitted_packages: ["mybootlib"],
}
java_sdk_library_import {
@@ -850,6 +856,7 @@ java_sdk_library_import {
apex_available: ["//apex_available:platform"],
shared_library: true,
compile_dex: true,
permitted_packages: ["mysdklibrary"],
public: {
jars: ["sdk_library/public/mysdklibrary-stubs.jar"],
stub_srcs: ["sdk_library/public/mysdklibrary_stub_sources"],