Revert "Implement detecting container violations."
This reverts commit bb678f82d6bb5cd89bf282e88a879123d9763d61.
Reason for revert: Droidmonitor created revert due to b/362639013. Will be verifying through ABTD before submission.
Change-Id: I1dcb71672eeb44a17cf176d3731bcaf9aaf81edf
diff --git a/apex/container_test.go b/apex/container_test.go
index d28b1a6..3931174 100644
--- a/apex/container_test.go
+++ b/apex/container_test.go
@@ -30,7 +30,7 @@
result := android.GroupFixturePreparers(
prepareForApexTest,
java.PrepareForTestWithJavaSdkLibraryFiles,
- java.FixtureWithLastReleaseApis("mybootclasspathlib", "bar"),
+ java.FixtureWithLastReleaseApis("mybootclasspathlib"),
).RunTestWithBp(t, `
apex {
name: "myapex",
@@ -68,17 +68,16 @@
],
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 @@
"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 @@
"myapex",
],
min_sdk_version: "30",
- sdk_version: "core_current",
}
`)
testcases := []struct {
@@ -134,7 +130,7 @@
isApexContainer: false,
},
{
- moduleName: "food",
+ moduleName: "foo",
variant: "android_common_apex30",
isSystemContainer: true,
isApexContainer: true,
@@ -166,7 +162,7 @@
result := android.GroupFixturePreparers(
prepareForApexTest,
java.PrepareForTestWithJavaSdkLibraryFiles,
- java.FixtureWithLastReleaseApis("mybootclasspathlib", "bar"),
+ java.FixtureWithLastReleaseApis("mybootclasspathlib"),
).RunTestWithBp(t, `
apex {
name: "myapex",
@@ -203,30 +199,26 @@
],
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 @@
isApexContainer: false,
},
{
- moduleName: "food",
+ moduleName: "foo",
variant: "android_common_apex10000",
isSystemContainer: true,
isApexContainer: true,