Revert "Do not include package name twice in the name of generated files"

This reverts commit 252fee6b12d9b69176c007f54ab060f96e6c679e.

Reason for revert: The change broke blaze integration.

Change-Id: I5e6bc9fb8b02085acae8d32119dd64cc9f912cf3

1 files changed, 5 insertions, 1 deletions

diff --git a/compiler/src/main/java/android/databinding/annotationprocessor/ProcessBindable.java b/compiler/src/main/java/android/databinding/annotationprocessor/ProcessBindable.java
index 96a8c765..52b6d5f6 100644
--- a/compiler/src/main/java/android/databinding/annotationprocessor/ProcessBindable.java
+++ b/compiler/src/main/java/android/databinding/annotationprocessor/ProcessBindable.java
@@ -88,7 +88,7 @@ public class ProcessBindable extends ProcessDataBinding.ProcessingStep implement
                 }
             }
             GenerationalClassUtil.writeIntermediateFile(mProperties.getPackage(),
-                    GenerationalClassUtil.ExtensionFilter.BR.getExtension(), mProperties);
+                    createIntermediateFileName(mProperties.getPackage()), mProperties);
             generateBRClasses(args, mProperties.getPackage());
         }
         return false;
@@ -109,6 +109,10 @@ public class ProcessBindable extends ProcessDataBinding.ProcessingStep implement
             ProcessingEnvironment processingEnvironment, DataBindingCompilerArgs args) {
     }
 
+    private String createIntermediateFileName(String appPkg) {
+        return appPkg + GenerationalClassUtil.ExtensionFilter.BR.getExtension();
+    }
+
     private void generateBRClasses(DataBindingCompilerArgs compilerArgs, String pkg) {
         try {
             Set<String> written = new HashSet<>();