[Partition] Set simple partitioning scheme as default
Change-Id: I3553ab968cff29b21c715b9fc011aab877f39d6a
diff --git a/src/main/java/com/android/tools/r8/retrace/internal/MappingPartitionKeyStrategy.java b/src/main/java/com/android/tools/r8/retrace/internal/MappingPartitionKeyStrategy.java
index 1ee7fa3..b31d984 100644
--- a/src/main/java/com/android/tools/r8/retrace/internal/MappingPartitionKeyStrategy.java
+++ b/src/main/java/com/android/tools/r8/retrace/internal/MappingPartitionKeyStrategy.java
@@ -8,8 +8,7 @@
OBFUSCATED_TYPE_NAME_AS_KEY(0),
OBFUSCATED_TYPE_NAME_AS_KEY_WITH_PARTITIONS(1);
- private static final MappingPartitionKeyStrategy DEFAULT_STRATEGY =
- OBFUSCATED_TYPE_NAME_AS_KEY_WITH_PARTITIONS;
+ private static final MappingPartitionKeyStrategy DEFAULT_STRATEGY = OBFUSCATED_TYPE_NAME_AS_KEY;
private final int serializedKey;
diff --git a/src/test/java/com/android/tools/r8/retrace/partition/RetracePartitionAndJoinIdentityTest.java b/src/test/java/com/android/tools/r8/retrace/partition/RetracePartitionAndJoinIdentityTest.java
index 1bd8f56..83287ff 100644
--- a/src/test/java/com/android/tools/r8/retrace/partition/RetracePartitionAndJoinIdentityTest.java
+++ b/src/test/java/com/android/tools/r8/retrace/partition/RetracePartitionAndJoinIdentityTest.java
@@ -13,8 +13,9 @@
import com.android.tools.r8.ToolHelper;
import com.android.tools.r8.retrace.MappingPartitionMetadata;
import com.android.tools.r8.retrace.PartitionedToProguardMappingConverter;
-import com.android.tools.r8.retrace.ProguardMapPartitioner;
import com.android.tools.r8.retrace.ProguardMapProducer;
+import com.android.tools.r8.retrace.internal.MappingPartitionKeyStrategy;
+import com.android.tools.r8.retrace.internal.ProguardMapPartitionerOnClassNameToText.ProguardMapPartitionerBuilderImplInternal;
import com.android.tools.r8.utils.StringUtils;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -47,7 +48,9 @@
TestDiagnosticMessagesImpl diagnosticsHandler = new TestDiagnosticMessagesImpl();
Map<String, byte[]> partitions = new HashMap<>();
MappingPartitionMetadata metadataData =
- ProguardMapPartitioner.builder(diagnosticsHandler)
+ new ProguardMapPartitionerBuilderImplInternal(diagnosticsHandler)
+ .setMappingPartitionKeyStrategy(
+ MappingPartitionKeyStrategy.OBFUSCATED_TYPE_NAME_AS_KEY_WITH_PARTITIONS)
.setProguardMapProducer(proguardMapProducer)
.setPartitionConsumer(
partition -> partitions.put(partition.getKey(), partition.getPayload()))
diff --git a/src/test/java/com/android/tools/r8/retrace/partition/RetracePartitionMetadataPartitionNamesTest.java b/src/test/java/com/android/tools/r8/retrace/partition/RetracePartitionMetadataPartitionNamesTest.java
index 6db000b..376d072 100644
--- a/src/test/java/com/android/tools/r8/retrace/partition/RetracePartitionMetadataPartitionNamesTest.java
+++ b/src/test/java/com/android/tools/r8/retrace/partition/RetracePartitionMetadataPartitionNamesTest.java
@@ -54,7 +54,7 @@
" void field -> a",
"some.class2 -> " + obfuscatedClass2.getTypeName() + ":",
" void field -> a",
- "some.class2 -> " + obfuscatedClass3.getTypeName() + ":",
+ "some.class3 -> " + obfuscatedClass3.getTypeName() + ":",
" void field -> a");
@Test
diff --git a/third_party/r8mappings.tar.gz.sha1 b/third_party/r8mappings.tar.gz.sha1
index 424ff92..bb6bada 100644
--- a/third_party/r8mappings.tar.gz.sha1
+++ b/third_party/r8mappings.tar.gz.sha1
@@ -1 +1 @@
-10daa67ab31114fd4649c996e1ac82c63a5b5e4e
\ No newline at end of file
+36c9b3f2335c084a6d5e270a7ac8fdcca0e72a74
\ No newline at end of file
