commit f8dfe5abd97dde877ab0761dbcf06efad1d798c0
author cpeyser <cpeyser@google.com> Mon Apr 02 13:43:20 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Mon Apr 02 13:44:32 2018 -0700
tree 821d6762c6ec4225f2883b72a62d907602123ed9
parent 9012e6f2ddbca2af21f9ae892a9d2fb09841e304

Serialize PythonUtils#GET_INIT_PY_FILES as a singleton so that object equality
holds in the check in Runfiles.Builder#merge.

PiperOrigin-RevId: 191341008

src/main/java/com/google/devtools/build/lib/rules/python/PythonUtils.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/python/PythonUtils.java b/src/main/java/com/google/devtools/build/lib/rules/python/PythonUtils.java
index 39d88ab..7acd86c 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/python/PythonUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/python/PythonUtils.java
@@ -39,7 +39,6 @@
 
   private static final FileType REQUIRES_INIT_PY = FileType.of(".py", ".so", ".pyc");
 
-  @AutoCodec
   static class GetInitPyFiles implements Runfiles.EmptyFilesSupplier {
     @Override
     public Iterable<PathFragment> getExtraPaths(Set<PathFragment> manifestPaths) {
@@ -47,6 +46,7 @@
     }
   }
 
+  @AutoCodec
   public static final Runfiles.EmptyFilesSupplier GET_INIT_PY_FILES = new GetInitPyFiles();
 
   private PythonUtils() {