commit 6553035389388ec6318e3cb0ad9ae6a0d7e0e08f
author Christoffer Quist Adamsen <christofferqa@google.com> Fri Mar 06 13:41:41 2020 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Fri Mar 06 13:41:41 2020 +0100
tree f4556839692b9b3ad0f00e967a2e684b07197256
parent 5d68cbc51973e40dcda6ded3b439117791c4853d

Mark clinit field as final

It is required that fields on interfaces are public final static

Change-Id: I3a06b82d4c7cbc1d0721f62d0cd1554bb6b6651a

src/main/java/com/android/tools/r8/ir/analysis/fieldaccess/TrivialFieldAccessReprocessor.java

diff --git a/src/main/java/com/android/tools/r8/ir/analysis/fieldaccess/TrivialFieldAccessReprocessor.java b/src/main/java/com/android/tools/r8/ir/analysis/fieldaccess/TrivialFieldAccessReprocessor.java
index 178e9b2..e8130e4 100644
--- a/src/main/java/com/android/tools/r8/ir/analysis/fieldaccess/TrivialFieldAccessReprocessor.java
+++ b/src/main/java/com/android/tools/r8/ir/analysis/fieldaccess/TrivialFieldAccessReprocessor.java
@@ -107,7 +107,10 @@
         if (clazz.lookupStaticField(dexItemFactory.objectMembers.clinitField) == null) {
           FieldAccessFlags accessFlags =
               FieldAccessFlags.fromSharedAccessFlags(
-                  Constants.ACC_SYNTHETIC | Constants.ACC_PUBLIC | Constants.ACC_STATIC);
+                  Constants.ACC_SYNTHETIC
+                      | Constants.ACC_FINAL
+                      | Constants.ACC_PUBLIC
+                      | Constants.ACC_STATIC);
           clazz.appendStaticField(
               new DexEncodedField(
                   dexItemFactory.createField(clazz.type, clinitField.type, clinitField.name),