@AutoCodec stray usage of AndroidDataConverter. It should always be a static constant.

This allows us to continue using lambdas in its definition.

This is a partial rollback of https://github.com/bazelbuild/bazel/commit/ed1e7594b23100f89755491f36e46886b4a51c8d, since the work done to class-ify things there is unnecessary once every instance is @AutoCodec-ed.

PiperOrigin-RevId: 200504678

1 files changed, 6 insertions, 10 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/RClassGeneratorActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/RClassGeneratorActionBuilder.java
index 7798f019b2..8cb592419d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/RClassGeneratorActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/RClassGeneratorActionBuilder.java
@@ -97,16 +97,12 @@ public class RClassGeneratorActionBuilder {
 
   private static Function<ValidatedAndroidData, String> chooseDepsToArg(
       final AndroidAaptVersion version) {
-    // Use an anonymous inner class for serialization.
-    return new Function<ValidatedAndroidData, String>() {
-      @Override
-      public String apply(ValidatedAndroidData container) {
-        Artifact rTxt =
-            version == AndroidAaptVersion.AAPT2 ? container.getAapt2RTxt() : container.getRTxt();
-        return (rTxt != null ? rTxt.getExecPath() : "")
-            + ","
-            + (container.getManifest() != null ? container.getManifest().getExecPath() : "");
-      }
+    return container -> {
+      Artifact rTxt =
+          version == AndroidAaptVersion.AAPT2 ? container.getAapt2RTxt() : container.getRTxt();
+      return (rTxt != null ? rTxt.getExecPath() : "")
+          + ","
+          + (container.getManifest() != null ? container.getManifest().getExecPath() : "");
     };
   }
 }