commit ea191cc626664597d84640e8758e800f91d2add3
author Christoffer Adamsen <christofferqa@google.com> Thu Aug 29 13:57:08 2024 +0200
committer Rico Wind <ricow@google.com> Thu Aug 29 12:02:52 2024 +0000
tree 723dbdf5b27734b398013bf75424bbdb6d65011c
parent 592c3ca3f5fa80e6a9f8bc47a857e06c08f57a64

Fix fastutil on main/test boundary

Change-Id: I902cdb2fbb4b7e95355aa2fc24fcce9c9f3b43de

src/main/java/com/android/tools/r8/DexSegments.java

diff --git a/src/main/java/com/android/tools/r8/DexSegments.java b/src/main/java/com/android/tools/r8/DexSegments.java
index b6ca92d..117006b 100644
--- a/src/main/java/com/android/tools/r8/DexSegments.java
+++ b/src/main/java/com/android/tools/r8/DexSegments.java
@@ -140,6 +140,11 @@
     }
   }
 
+  public static Map<Integer, SegmentInfo> runForTesting(Command command)
+      throws IOException, ResourceException {
+    return run(command);
+  }
+
   public static Int2ReferenceMap<SegmentInfo> run(Command command)
       throws IOException, ResourceException {
     if (command.isPrintHelp()) {

src/test/java/com/android/tools/r8/dex/DexCodeDeduppingTest.java

diff --git a/src/test/java/com/android/tools/r8/dex/DexCodeDeduppingTest.java b/src/test/java/com/android/tools/r8/dex/DexCodeDeduppingTest.java
index d5b8f32..55f23f9 100644
--- a/src/test/java/com/android/tools/r8/dex/DexCodeDeduppingTest.java
+++ b/src/test/java/com/android/tools/r8/dex/DexCodeDeduppingTest.java
@@ -239,7 +239,7 @@
   public SegmentInfo getCodeSegmentInfo(Path path)
       throws CompilationFailedException, ResourceException, IOException {
     Command.Builder builder = Command.builder().addProgramFiles(path);
-    Map<Integer, SegmentInfo> segmentInfoMap = DexSegments.run(builder.build());
+    Map<Integer, SegmentInfo> segmentInfoMap = DexSegments.runForTesting(builder.build());
     return segmentInfoMap.get(Constants.TYPE_CODE_ITEM);
   }
 

src/test/java/com/android/tools/r8/naming/sourcefile/StringPoolSizeWithLazyDexStringsTest.java

diff --git a/src/test/java/com/android/tools/r8/naming/sourcefile/StringPoolSizeWithLazyDexStringsTest.java b/src/test/java/com/android/tools/r8/naming/sourcefile/StringPoolSizeWithLazyDexStringsTest.java
index 4598b8a..bfc8f65 100644
--- a/src/test/java/com/android/tools/r8/naming/sourcefile/StringPoolSizeWithLazyDexStringsTest.java
+++ b/src/test/java/com/android/tools/r8/naming/sourcefile/StringPoolSizeWithLazyDexStringsTest.java
@@ -66,7 +66,7 @@
 
   private void checkStringSegmentSize(R8TestCompileResult result) throws Exception {
     Map<Integer, SegmentInfo> segments =
-        DexSegments.run(Command.builder().addProgramFiles(result.writeToZip()).build());
+        DexSegments.runForTesting(Command.builder().addProgramFiles(result.writeToZip()).build());
     SegmentInfo stringInfo = segments.get(Constants.TYPE_STRING_ID_ITEM);
     assertEquals(8, stringInfo.getItemCount());
   }