Merge "Revert "bootclasspath_fragment: Treat some specific modules as test""
This commit is contained in:
@@ -408,22 +408,6 @@ func TestBootclasspathFragment_Test(t *testing.T) {
|
||||
},
|
||||
}
|
||||
|
||||
bootclasspath_fragment {
|
||||
name: "test_fragment",
|
||||
contents: ["mysdklibrary"],
|
||||
hidden_api: {
|
||||
split_packages: [],
|
||||
},
|
||||
}
|
||||
|
||||
bootclasspath_fragment {
|
||||
name: "apex.apexd_test_bootclasspath-fragment",
|
||||
contents: ["mysdklibrary"],
|
||||
hidden_api: {
|
||||
split_packages: [],
|
||||
},
|
||||
}
|
||||
|
||||
bootclasspath_fragment_test {
|
||||
name: "a_test_fragment",
|
||||
contents: ["mysdklibrary"],
|
||||
@@ -445,12 +429,6 @@ func TestBootclasspathFragment_Test(t *testing.T) {
|
||||
fragment := result.Module("myfragment", "android_common").(*BootclasspathFragmentModule)
|
||||
android.AssertBoolEquals(t, "not a test fragment", false, fragment.isTestFragment())
|
||||
|
||||
fragment = result.Module("test_fragment", "android_common").(*BootclasspathFragmentModule)
|
||||
android.AssertBoolEquals(t, "is a test fragment by prefix", true, fragment.isTestFragment())
|
||||
|
||||
fragment = result.Module("a_test_fragment", "android_common").(*BootclasspathFragmentModule)
|
||||
android.AssertBoolEquals(t, "is a test fragment by type", true, fragment.isTestFragment())
|
||||
|
||||
fragment = result.Module("apex.apexd_test_bootclasspath-fragment", "android_common").(*BootclasspathFragmentModule)
|
||||
android.AssertBoolEquals(t, "is a test fragment by name", true, fragment.isTestFragment())
|
||||
}
|
||||
|
Reference in New Issue
Block a user