commit dbc7cf06cf92b43367722f71ce4e4e666c267113
author Christoffer Adamsen <christofferqa@google.com> Tue May 14 13:37:05 2024 +0200
committer Christoffer Adamsen <christofferqa@google.com> Wed May 15 14:22:39 2024 +0000
tree a6fab588e61e46621c4620e698f0911260d29073
parent 3b9a6e6564eb1fd806bf95b89938a291332645bc

Enable publicizing of BlazeGeneratedExtensionRegistryLiteLoader

This adds allowaccessmodification to the following rule to enable publicizing. This is necessary to avoid illegal accesses since this class is accessed reflectively and the reflective access may be inlined outside the current package.

-keep,allowobfuscation class com.google.protobuf.BlazeGeneratedExtensionRegistryLiteLoader {
  <init>();
}

Change-Id: Ic135dd325df93c305c9301e5b802af2d81e7ce15

src/test/java/com/android/tools/r8/internal/proto/Proto2BuilderShrinkingTest.java

diff --git a/src/test/java/com/android/tools/r8/internal/proto/Proto2BuilderShrinkingTest.java b/src/test/java/com/android/tools/r8/internal/proto/Proto2BuilderShrinkingTest.java
index 3c6211e..327b8e2 100644
--- a/src/test/java/com/android/tools/r8/internal/proto/Proto2BuilderShrinkingTest.java
+++ b/src/test/java/com/android/tools/r8/internal/proto/Proto2BuilderShrinkingTest.java
@@ -16,7 +16,6 @@
 import com.android.tools.r8.TestParameters;
 import com.android.tools.r8.errors.Unreachable;
 import com.android.tools.r8.graph.DexType;
-import com.android.tools.r8.utils.AndroidApiLevel;
 import com.android.tools.r8.utils.StringUtils;
 import com.android.tools.r8.utils.codeinspector.ClassSubject;
 import com.android.tools.r8.utils.codeinspector.CodeInspector;
@@ -147,8 +146,6 @@
   private void checkRunResult(SingleTestRunResult<?> runResult, String main, boolean isR8) {
     if (main.equals("proto2.HasFlaggedOffExtensionBuilderTestClass")) {
       runResult.applyIf(
-          isR8 && protoRuntime.isEdition2023() && parameters.getApiLevel() == AndroidApiLevel.O,
-          rr -> rr.assertFailureWithErrorThatThrows(IllegalAccessException.class),
           !isR8 && protoRuntime.isEdition2023() && protoTestSources.isProto2(),
           rr -> rr.assertFailureWithErrorThatThrows(InvalidProtocolBufferException.class),
           rr -> rr.assertSuccessWithOutput(getExpectedOutput(main)));

third_party/proto/runtime/edition2023.tar.gz.sha1

diff --git a/third_party/proto/runtime/edition2023.tar.gz.sha1 b/third_party/proto/runtime/edition2023.tar.gz.sha1
index 8c8140e..da4597b 100644
--- a/third_party/proto/runtime/edition2023.tar.gz.sha1
+++ b/third_party/proto/runtime/edition2023.tar.gz.sha1
@@ -1 +1 @@
-583591cbd3ee7d7dd5ca9e0fefc4f015fa7b6007
\ No newline at end of file
+cf666de2c74226c90b2edbab9a9ec12feeaeabe6
\ No newline at end of file