Revert "Allow obfuscating D8/R8 boundary in R8 partial"
This reverts commit d3e54cce144a12e208018f79298b24769d14e600.
Reason for revert: Test failure
Change-Id: I4676c5b536f06544903bb765467fb5cf210a2bbd
diff --git a/src/main/java/com/android/tools/r8/shaking/RootSetUtils.java b/src/main/java/com/android/tools/r8/shaking/RootSetUtils.java
index 46399ea..c1befbf 100644
--- a/src/main/java/com/android/tools/r8/shaking/RootSetUtils.java
+++ b/src/main/java/com/android/tools/r8/shaking/RootSetUtils.java
@@ -232,7 +232,7 @@
new R8PartialUseCollector(appView) {
private final ProguardKeepRuleModifiers modifiers =
- ProguardKeepRuleModifiers.builder().setAllowsObfuscation(true).build();
+ ProguardKeepRuleModifiers.builder().build();
// TODO(b/390576160): Add a test that this works when using -whyareyoukeeping.
private final ReferencedFromD8InR8PartialFakeProguardRule keepRule =
new ReferencedFromD8InR8PartialFakeProguardRule();
diff --git a/src/test/java/com/android/tools/r8/partial/PartialCompilationKeepAllowObfuscationBoundaryTest.java b/src/test/java/com/android/tools/r8/partial/PartialCompilationKeepAllowObfuscationBoundaryTest.java
deleted file mode 100644
index 30bafec..0000000
--- a/src/test/java/com/android/tools/r8/partial/PartialCompilationKeepAllowObfuscationBoundaryTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright (c) 2025, the R8 project authors. Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-package com.android.tools.r8.partial;
-
-import static com.android.tools.r8.utils.codeinspector.Matchers.isPresentAndRenamed;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-import com.android.tools.r8.TestBase;
-import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.TestParametersCollection;
-import com.android.tools.r8.utils.codeinspector.ClassSubject;
-import com.android.tools.r8.utils.codeinspector.MethodSubject;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
-public class PartialCompilationKeepAllowObfuscationBoundaryTest extends TestBase {
-
- @Parameter(0)
- public TestParameters parameters;
-
- @Parameters(name = "{0}")
- public static TestParametersCollection data() {
- return getTestParameters().withAllRuntimesAndApiLevels().build();
- }
-
- @Test
- public void test() throws Exception {
- parameters.assumeR8PartialTestParameters();
- testForR8Partial(parameters.getBackend())
- .addR8IncludedClasses(IncludedClass.class)
- .addR8ExcludedClasses(Main.class)
- .setMinApi(parameters)
- .compile()
- .inspect(
- inspector -> {
- ClassSubject includedClassSubject = inspector.clazz(IncludedClass.class);
- assertThat(includedClassSubject, isPresentAndRenamed());
-
- MethodSubject fooMethodSubject =
- includedClassSubject.uniqueMethodWithOriginalName("foo");
- assertThat(fooMethodSubject, isPresentAndRenamed());
- })
- .run(parameters.getRuntime(), Main.class)
- .assertSuccessWithOutputLines("Hello, world!");
- }
-
- static class Main {
-
- public static void main(String[] args) {
- IncludedClass.foo();
- }
- }
-
- static class IncludedClass {
-
- static void foo() {
- System.out.println("Hello, world!");
- }
- }
-}
