diff options
| author | 2024-08-28 05:48:21 +0000 | |
|---|---|---|
| committer | 2024-08-28 05:48:21 +0000 | |
| commit | f2d6e5004f1a1fc3eadef6f90a2bbb632e8f2430 (patch) | |
| tree | 0a3e78a18b1b0ac77dc8a3eead46570030cb579b /apex/container_test.go | |
| parent | 26f071db927ee581a593636bd5a2be843edf4ca5 (diff) | |
| parent | b2b1ef63e2ee63b137cb71ae2360c111e5d9647f (diff) | |
Merge "Revert "Implement detecting container violations."" into main
Diffstat (limited to 'apex/container_test.go')
| -rw-r--r-- | apex/container_test.go | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/apex/container_test.go b/apex/container_test.go index d28b1a649..39311741d 100644 --- a/apex/container_test.go +++ b/apex/container_test.go @@ -30,7 +30,7 @@ func TestApexDepsContainers(t *testing.T) { result := android.GroupFixturePreparers( prepareForApexTest, java.PrepareForTestWithJavaSdkLibraryFiles, - java.FixtureWithLastReleaseApis("mybootclasspathlib", "bar"), + java.FixtureWithLastReleaseApis("mybootclasspathlib"), ).RunTestWithBp(t, ` apex { name: "myapex", @@ -68,17 +68,16 @@ func TestApexDepsContainers(t *testing.T) { ], compile_dex: true, static_libs: [ - "food", + "foo", "baz", ], libs: [ - "bar.stubs", + "bar", ], min_sdk_version: "30", - sdk_version: "current", } java_library { - name: "food", + name: "foo", srcs:[ "A.java", ], @@ -86,15 +85,13 @@ func TestApexDepsContainers(t *testing.T) { "myapex", ], min_sdk_version: "30", - sdk_version: "core_current", } - java_sdk_library { + java_library { name: "bar", srcs:[ "A.java", ], min_sdk_version: "30", - sdk_version: "core_current", } java_library { name: "baz", @@ -106,7 +103,6 @@ func TestApexDepsContainers(t *testing.T) { "myapex", ], min_sdk_version: "30", - sdk_version: "core_current", } `) testcases := []struct { @@ -134,7 +130,7 @@ func TestApexDepsContainers(t *testing.T) { isApexContainer: false, }, { - moduleName: "food", + moduleName: "foo", variant: "android_common_apex30", isSystemContainer: true, isApexContainer: true, @@ -166,7 +162,7 @@ func TestNonUpdatableApexDepsContainers(t *testing.T) { result := android.GroupFixturePreparers( prepareForApexTest, java.PrepareForTestWithJavaSdkLibraryFiles, - java.FixtureWithLastReleaseApis("mybootclasspathlib", "bar"), + java.FixtureWithLastReleaseApis("mybootclasspathlib"), ).RunTestWithBp(t, ` apex { name: "myapex", @@ -203,30 +199,26 @@ func TestNonUpdatableApexDepsContainers(t *testing.T) { ], compile_dex: true, static_libs: [ - "food", + "foo", ], libs: [ - "bar.stubs", + "bar", ], - sdk_version: "current", } java_library { - name: "food", + name: "foo", srcs:[ "A.java", ], apex_available: [ "myapex", ], - sdk_version: "core_current", } - java_sdk_library { + java_library { name: "bar", srcs:[ "A.java", ], - sdk_version: "none", - system_modules: "none", } `) testcases := []struct { @@ -254,7 +246,7 @@ func TestNonUpdatableApexDepsContainers(t *testing.T) { isApexContainer: false, }, { - moduleName: "food", + moduleName: "foo", variant: "android_common_apex10000", isSystemContainer: true, isApexContainer: true, |