Breaking up is hard to do: AndroidResourceProcessor

* Extract merging methods to a static class
* Extract output methods to a static class
* Extract manifest processing methods to a class
* Move ExecutorCloserService to the top level

--
PiperOrigin-RevId: 150219121
MOS_MIGRATED_REVID=150219121

1 files changed, 1 insertions, 1 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/LibraryRClassGeneratorAction.java b/src/tools/android/java/com/google/devtools/build/android/LibraryRClassGeneratorAction.java
index 59a200443f..51c771946b 100644
--- a/src/tools/android/java/com/google/devtools/build/android/LibraryRClassGeneratorAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/LibraryRClassGeneratorAction.java
@@ -106,7 +106,7 @@ public class LibraryRClassGeneratorAction {
       logger.fine(
           String.format("R writing finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS)));
 
-      resourceProcessor.createClassJar(scopedTmp.getPath(), options.classJarOutput);
+      AndroidResourceOutputs.createClassJar(scopedTmp.getPath(), options.classJarOutput);
       logger.fine(
           String.format(
               "Creating class jar finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS)));