commit fc8a5fc24ab3d34a42c1e1bcc7fbc349b0f3c082
author Christoffer Adamsen <christofferqa@google.com> Tue Sep 17 10:47:18 2024 +0200
committer Christoffer Adamsen <christofferqa@google.com> Tue Sep 17 10:47:18 2024 +0200
tree 5a43a1e2b4a02e8a0bab5ec32fe9865e8264b93d
parent 6b2d0d2da7387b9ad506b6589990051c5923fa98

Update BackportPlatformTest to use setAndroidPlatformBuild

Change-Id: I5a3a9983bf7b6012f7e3ea9a0d77e70e23abf268

src/test/java/com/android/tools/r8/desugar/backports/BackportPlatformTest.java

diff --git a/src/test/java/com/android/tools/r8/desugar/backports/BackportPlatformTest.java b/src/test/java/com/android/tools/r8/desugar/backports/BackportPlatformTest.java
index 49b8d05..3b1f2a7 100644
--- a/src/test/java/com/android/tools/r8/desugar/backports/BackportPlatformTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/backports/BackportPlatformTest.java
@@ -67,10 +67,10 @@
   @Test
   public void testPlatformR8() throws Exception {
     testForR8(parameters.getBackend())
-        .apply(b -> b.getBuilder().setAndroidPlatformBuild(true))
         .addProgramClasses(CLASSES)
         .addKeepMainRule(TestClass.class)
         .addKeepClassAndMembersRules(MiniAssert.class)
+        .setAndroidPlatformBuild()
         .setMinApi(parameters)
         .allowDiagnosticWarningMessages()
         .compileWithExpectedDiagnostics(this::checkDiagnostics);
@@ -79,8 +79,8 @@
   @Test
   public void testPlatformD8() throws Exception {
     testForD8(parameters.getBackend())
-        .apply(b -> b.getBuilder().setAndroidPlatformBuild(true))
         .addProgramClasses(CLASSES)
+        .setAndroidPlatformBuild()
         .setMinApi(parameters)
         .compileWithExpectedDiagnostics(this::checkDiagnostics);
   }
@@ -88,12 +88,12 @@
   @Test
   public void testPlatformDefinitionD8() throws Exception {
     testForD8(parameters.getBackend())
-        .apply(b -> b.getBuilder().setAndroidPlatformBuild(true))
         .addProgramClasses(CLASSES)
         .addProgramClassFileData(
             transformer(BooleanDefinition.class)
                 .setClassDescriptor("Ljava/lang/Boolean;")
                 .transform())
+        .setAndroidPlatformBuild()
         .setMinApi(parameters)
         .compile()
         .assertNoMessages()
@@ -106,8 +106,8 @@
     assertEquals(AndroidApiLevel.J, parameters.getApiLevel());
     testForD8(parameters.getBackend())
         // Setting an API the backport won't hit the backport trigger.
+        .setAndroidPlatformBuild()
         .setMinApi(AndroidApiLevel.K)
-        .apply(b -> b.getBuilder().setAndroidPlatformBuild(true))
         .addProgramClasses(CLASSES)
         .compile()
         .assertNoMessages()

src/test/testbase/java/com/android/tools/r8/D8TestBuilder.java

diff --git a/src/test/testbase/java/com/android/tools/r8/D8TestBuilder.java b/src/test/testbase/java/com/android/tools/r8/D8TestBuilder.java
index 2c499f4..57aa6cc 100644
--- a/src/test/testbase/java/com/android/tools/r8/D8TestBuilder.java
+++ b/src/test/testbase/java/com/android/tools/r8/D8TestBuilder.java
@@ -40,6 +40,7 @@
   private boolean enableMissingLibraryApiModeling = true;
   private List<ExternalArtProfile> residualArtProfiles = new ArrayList<>();
   private Box<D8BuildMetadata> buildMetadata;
+  private boolean androidPlatformBuild = false;
 
   @Override
   public boolean isD8TestBuilder() {
@@ -91,6 +92,7 @@
       BenchmarkResults benchmarkResults)
       throws CompilationFailedException {
     libraryDesugaringTestConfiguration.configure(builder);
+    builder.setAndroidPlatformBuild(androidPlatformBuild);
     if (buildMetadata != null) {
       builder.setBuildMetadataConsumer(buildMetadata::set);
     }
@@ -185,4 +187,9 @@
     buildMetadata = new Box<>();
     return self();
   }
+
+  public D8TestBuilder setAndroidPlatformBuild() {
+    androidPlatformBuild = true;
+    return self();
+  }
 }