diff options
| author |  corysmith <corysmith@google.com> | 2017-05-23 17:19:14 +0200 |
|---|---|---|
| committer |  Irina Iancu <elenairina@google.com> | 2017-05-23 17:41:32 +0200 |
| commit | f6c4d6d66118410b1139a84fe34ba8134661bfa2 (patch) | |
| tree | 67ee24a40c88bea1a38807155806fb957a852b9a /src/tools/android/java/com/google/devtools/build/android/AndroidResourceMerger.java | |
| parent | 81316798806b274d84c4eb1131bab8c90b0c7ba1 (diff) | |
Add a new action for generating reconciled R classes for Robolectric.
This includes some refactoring:
* Move the symbol deserialization our of the merger and into the ParsedAndroidData (probably move again.)
* Change the FailedFutureAggregator generics to work more callables
RELNOTES: None
PiperOrigin-RevId: 156863698
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/AndroidResourceMerger.java')
| -rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/AndroidResourceMerger.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMerger.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMerger.java index 7101033c89..8fc6075382 100644 --- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMerger.java +++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMerger.java @@ -70,8 +70,6 @@ public class AndroidResourceMerger { final ListeningExecutorService executorService = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(15)); try (Closeable closeable = ExecutorServiceCloser.createWith(executorService)) { - AndroidDataMerger merger = - AndroidDataMerger.createWithPathDeduplictor(executorService, deserializer); UnwrittenMergedAndroidData merged = mergeData( executorService, |