diff options
| author |  Googler <noreply@google.com> | 2016-05-09 19:22:27 +0000 |
|---|---|---|
| committer |  Klaus Aehlig <aehlig@google.com> | 2016-05-10 07:57:21 +0000 |
| commit | 5a2dd7a2099cfa5a50b07d2b407e478043727472 (patch) | |
| tree | 3e4cd3341cb359151ed32132c9443a62cd80e49e /src/tools/android/java/com/google/devtools/build/android/AndroidDataMerger.java | |
| parent | b64150de45415f3871e1de0a2c182636567b9225 (diff) | |
Renaming nonOverwriting to combining resources.
--
MOS_MIGRATED_REVID=121863653
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 | 2 |
1 files changed, 1 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 3b39205ad8..c9a11bbe36 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 @@ -340,7 +340,7 @@ public class AndroidDataMerger { ParsedAndroidData.of( ImmutableSet.<MergeConflict>of(), ImmutableMap.copyOf(overwritableDeps), - direct.mergeNonOverwritable(transitive), + direct.mergeCombining(transitive), ImmutableMap.copyOf(assets))); } catch (IOException e) { throw new MergingException(e); |