Revert "Disable test on bots" This reverts commit 72f39e4954936a9912d4de5434810cbb703b68f5. Reason for revert: Breaks build Change-Id: Ieee12d90d508c9eda080e0cad9630ac6e2bf3e6d
diff --git a/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/humanspecification/MultiAPILevelHumanDesugaredLibrarySpecification.java b/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/humanspecification/MultiAPILevelHumanDesugaredLibrarySpecification.java index dff3d13..6ea4fd1 100644 --- a/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/humanspecification/MultiAPILevelHumanDesugaredLibrarySpecification.java +++ b/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/humanspecification/MultiAPILevelHumanDesugaredLibrarySpecification.java
@@ -5,6 +5,7 @@ package com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; +import java.util.Map; public class MultiAPILevelHumanDesugaredLibrarySpecification { @@ -39,4 +40,16 @@ public Int2ObjectMap<HumanRewritingFlags> getProgramFlags() { return programFlags; } + + public Map<Integer, HumanRewritingFlags> getCommonFlagsForTesting() { + return commonFlags; + } + + public Map<Integer, HumanRewritingFlags> getLibraryFlagsForTesting() { + return libraryFlags; + } + + public Map<Integer, HumanRewritingFlags> getProgramFlagsForTesting() { + return programFlags; + } }
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/specification/ConvertExportReadTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/specification/ConvertExportReadTest.java index c7f4d02..4d861a0 100644 --- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/specification/ConvertExportReadTest.java +++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/specification/ConvertExportReadTest.java
@@ -76,9 +76,12 @@ MultiAPILevelHumanDesugaredLibrarySpecification humanSpec1, MultiAPILevelHumanDesugaredLibrarySpecification humanSpec2) { assertTopLevelFlagsEquals(humanSpec1.getTopLevelFlags(), humanSpec2.getTopLevelFlags()); - assertFlagMapEquals(humanSpec1.getCommonFlags(), humanSpec2.getCommonFlags()); - assertFlagMapEquals(humanSpec1.getLibraryFlags(), humanSpec2.getLibraryFlags()); - assertFlagMapEquals(humanSpec1.getProgramFlags(), humanSpec2.getProgramFlags()); + assertFlagMapEquals( + humanSpec1.getCommonFlagsForTesting(), humanSpec2.getCommonFlagsForTesting()); + assertFlagMapEquals( + humanSpec1.getLibraryFlagsForTesting(), humanSpec2.getLibraryFlagsForTesting()); + assertFlagMapEquals( + humanSpec1.getProgramFlagsForTesting(), humanSpec2.getProgramFlagsForTesting()); } private void assertFlagMapEquals(