StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Propagate permitted packages to sdk snapshot

Browse Source 
Previously, permitted_packages were not copied to the sdk snapshot.
This change corrects that.

Bug: 193763688
Test: m nothing
      - Added unit tests, which all failed and then fixed the tests.
Change-Id: I4560987f746f78c0ae706058195b6db4bea438aa
This commit is contained in:
Paul Duffin
2021-07-15 14:14:41 +01:00
parent bd14f9a952
commit 869de147ab
4 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sdk/bootclasspath_fragment_sdk_test.go
View File

@@ -327,6 +327,7 @@ java_import {
visibility: ["//visibility:public"],
apex_available: ["myapex"],
jars: ["java/mybootlib.jar"],
permitted_packages: ["mybootlib"],
}
java_sdk_library_import {
@@ -336,6 +337,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"],
@@ -409,6 +411,7 @@ java_import {
visibility: ["//visibility:public"],
apex_available: ["myapex"],
jars: ["java/mybootlib.jar"],
permitted_packages: ["mybootlib"],
}
java_sdk_library_import {
@@ -418,6 +421,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"],
@@ -779,6 +783,7 @@ func TestSnapshotWithBootclasspathFragment_HiddenAPI(t *testing.T) {
srcs: ["Test.java"],
compile_dex: true,
public: {enabled: true},
permitted_packages: ["mysdklibrary"],
}
`),
).RunTest(t)
@@ -822,6 +827,7 @@ java_import {
visibility: ["//visibility:public"],
apex_available: ["myapex"],
jars: ["java/mybootlib.jar"],
permitted_packages: ["mybootlib"],
}
java_sdk_library_import {
@@ -831,6 +837,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"],

9
sdk/java_sdk_test.go
View File

@@ -175,6 +175,7 @@ func TestSnapshotWithJavaHeaderLibrary(t *testing.T) {
sdk_version: "none",
compile_dex: true,
host_supported: true,
permitted_packages: ["pkg.myjavalib"],
}
`)
@@ -188,6 +189,7 @@ java_import {
visibility: ["//visibility:public"],
apex_available: ["//apex_available:platform"],
jars: ["java/myjavalib.jar"],
permitted_packages: ["pkg.myjavalib"],
}
`),
checkVersionedAndroidBpContents(`
@@ -199,6 +201,7 @@ java_import {
visibility: ["//visibility:public"],
apex_available: ["//apex_available:platform"],
jars: ["java/myjavalib.jar"],
permitted_packages: ["pkg.myjavalib"],
}
sdk_snapshot {
@@ -437,6 +440,7 @@ func TestSnapshotWithJavaBootLibrary(t *testing.T) {
system_modules: "none",
sdk_version: "none",
compile_dex: true,
permitted_packages: ["pkg.myjavalib"],
}
`)
@@ -450,6 +454,7 @@ java_import {
visibility: ["//visibility:public"],
apex_available: ["//apex_available:platform"],
jars: ["java/myjavalib.jar"],
permitted_packages: ["pkg.myjavalib"],
}
`),
checkVersionedAndroidBpContents(`
@@ -461,6 +466,7 @@ java_import {
visibility: ["//visibility:public"],
apex_available: ["//apex_available:platform"],
jars: ["java/myjavalib.jar"],
permitted_packages: ["pkg.myjavalib"],
}
module_exports_snapshot {
@@ -1045,6 +1051,7 @@ func TestSnapshotWithJavaSdkLibrary(t *testing.T) {
shared_library: false,
stubs_library_visibility: ["//other"],
stubs_source_visibility: ["//another"],
permitted_packages: ["pkg.myjavalib"],
}
`)
@@ -1058,6 +1065,7 @@ java_sdk_library_import {
visibility: ["//visibility:public"],
apex_available: ["//apex_available:anyapex"],
shared_library: false,
permitted_packages: ["pkg.myjavalib"],
public: {
jars: ["sdk_library/public/myjavalib-stubs.jar"],
stub_srcs: ["sdk_library/public/myjavalib_stub_sources"],
@@ -1090,6 +1098,7 @@ java_sdk_library_import {
visibility: ["//visibility:public"],
apex_available: ["//apex_available:anyapex"],
shared_library: false,
permitted_packages: ["pkg.myjavalib"],
public: {
jars: ["sdk_library/public/myjavalib-stubs.jar"],
stub_srcs: ["sdk_library/public/myjavalib_stub_sources"],