Commit eb883dcb authored by Aiden Benner's avatar Aiden Benner Committed by Commit Bot

Fix redundant field initializations in generated JNI wrapper

Normally custom ErrorProne checks would catch this,
but they were inadvertently disabled.
In preparation for for re-enabling these custom ErrorProne checks
this CL removes redundant field initializations in GEN_JNI
(the generated java file that contains proxy native methods).

Bug: 904524
Change-Id: I2e7b2d93b4ed89d34b236ab9a64dc6c47dcdd17d
Reviewed-on: https://chromium-review.googlesource.com/c/1334093Reviewed-by: default avatarYaron Friedman <yfriedman@chromium.org>
Reviewed-by: default avatarEric Stevenson <estevenson@chromium.org>
Commit-Queue: Aiden Benner <abenner@google.com>
Cr-Commit-Position: refs/heads/master@{#608403}
parent 43f6a1d5
...@@ -102,16 +102,18 @@ public class JniProcessor extends AbstractProcessor { ...@@ -102,16 +102,18 @@ public class JniProcessor extends AbstractProcessor {
} }
public JniProcessor() { public JniProcessor() {
// State of mNativesBuilder needs to be preserved between processing rounds. FieldSpec.Builder testingFlagBuilder =
FieldSpec testingFlag = FieldSpec.builder(TypeName.BOOLEAN, NATIVE_TEST_FIELD_NAME) FieldSpec.builder(TypeName.BOOLEAN, NATIVE_TEST_FIELD_NAME)
.addModifiers(Modifier.STATIC, Modifier.PUBLIC) .addModifiers(Modifier.STATIC, Modifier.PUBLIC);
.initializer("" + TESTING_ENABLED) if (TESTING_ENABLED) {
.build(); testingFlagBuilder.initializer("true");
}
// State of mNativesBuilder needs to be preserved between processing rounds.
mNativesBuilder = TypeSpec.classBuilder(NATIVE_CLASS_NAME) mNativesBuilder = TypeSpec.classBuilder(NATIVE_CLASS_NAME)
.addAnnotation(createGeneratedAnnotation()) .addAnnotation(createGeneratedAnnotation())
.addModifiers(Modifier.PUBLIC, Modifier.FINAL) .addModifiers(Modifier.PUBLIC, Modifier.FINAL)
.addField(testingFlag); .addField(testingFlagBuilder.build());
try { try {
sNativeMethodHashFunction = MessageDigest.getInstance("MD5"); sNativeMethodHashFunction = MessageDigest.getInstance("MD5");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment