diff options
| author |  Googler <noreply@google.com> | 2017-11-15 11:55:15 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2017-11-15 11:57:13 -0800 |
| commit | 7925d5b265249466bff385602e94509a05de6870 (patch) | |
| tree | 9543038c23171dd93261a792a6f0571591e3cb09 /src/tools/android/java/com/google/devtools/build/android/AndroidDataMerger.java | |
| parent | 1e0b7cb49b5d22f72d9e32018d15972a9f28878c (diff) | |
Create merge action and data deserializer for aapt2 compiled resources.
RELNOTES: None
PiperOrigin-RevId: 175858467
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/AndroidDataMerger.java')
| -rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/AndroidDataMerger.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidDataMerger.java b/src/tools/android/java/com/google/devtools/build/android/AndroidDataMerger.java index 8e550a2d60..16b43b848e 100644 --- a/src/tools/android/java/com/google/devtools/build/android/AndroidDataMerger.java +++ b/src/tools/android/java/com/google/devtools/build/android/AndroidDataMerger.java @@ -119,7 +119,9 @@ class AndroidDataMerger { @VisibleForTesting static AndroidDataMerger createWithDefaultThreadPool(SourceChecker deDuplicator) { return new AndroidDataMerger( - deDuplicator, MoreExecutors.newDirectExecutorService(), AndroidDataDeserializer.create()); + deDuplicator, + MoreExecutors.newDirectExecutorService(), + AndroidParsedDataDeserializer.create()); } /** Creates a merger with a file contents hashing deduplicator. */ |