Revert "bootclasspath_fragment: Treat some specific modules as test"
This reverts commit ff9b6faba2b9a949289c70657db87c0b1790cc07.
Reason for revert: No longer needed
Bug: 194063708
Test: m nothing
Change-Id: Ic2f6761c9a0a00a612724cb429f002a16522e53f
(cherry picked from commit d0fe1307aafc7714f3f9e9949a2c143be04fcf44)
Merged-In: Ic2f6761c9a0a00a612724cb429f002a16522e53f
diff --git a/java/bootclasspath_fragment.go b/java/bootclasspath_fragment.go
index c3053f8..34735c2 100644
--- a/java/bootclasspath_fragment.go
+++ b/java/bootclasspath_fragment.go
@@ -840,22 +840,7 @@
// isTestFragment returns true if the current module is a test bootclasspath_fragment.
func (b *BootclasspathFragmentModule) isTestFragment() bool {
- if b.testFragment {
- return true
- }
-
- // TODO(b/194063708): Once test fragments all use bootclasspath_fragment_test
- // Some temporary exceptions until all test fragments use the
- // bootclasspath_fragment_test module type.
- name := b.BaseModuleName()
- if strings.HasPrefix(name, "test_") {
- return true
- }
- if name == "apex.apexd_test_bootclasspath-fragment" {
- return true
- }
-
- return false
+ return b.testFragment
}
// produceHiddenAPIOutput produces the hidden API all-flags.csv file (and supporting files)