diff options
author | Googler <noreply@google.com> | 2017-03-15 18:34:58 +0000 |
---|---|---|
committer | Yun Peng <pcloudy@google.com> | 2017-03-16 08:36:33 +0000 |
commit | 6ff407df1fd6f5ccfab6d1a65c9e6708e719b61a (patch) | |
tree | 2069712517a3686cb5ccd26c36cb3b34367700d6 /src/tools/android/java/com/google/devtools/build/android/AarGeneratorAction.java | |
parent | d7b23448c4fa067b1056848a9bf2e5dd3e6b45d6 (diff) |
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
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/AarGeneratorAction.java')
-rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/AarGeneratorAction.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/AarGeneratorAction.java b/src/tools/android/java/com/google/devtools/build/android/AarGeneratorAction.java index 66d921b384..2dea78e650 100644 --- a/src/tools/android/java/com/google/devtools/build/android/AarGeneratorAction.java +++ b/src/tools/android/java/com/google/devtools/build/android/AarGeneratorAction.java @@ -132,7 +132,7 @@ public class AarGeneratorAction { // There aren't any dependencies, but we merge to combine primary resources from different // res/assets directories into a single res and single assets directory. MergedAndroidData mergedData = - resourceProcessor.mergeData( + AndroidResourceMerger.mergeData( options.mainData, ImmutableList.<DependencyAndroidData>of(), ImmutableList.<DependencyAndroidData>of(), |