Part 3 of 5: Merging semantics.

Introduces the AndroidDataMerger, MergeConflict, and UnwrittenMergedAndroidData which is the entry point in the AndroidResourceProcessing *AndroidData lifecycle.

Also, refactors the AndroidDataSet parsing of resources, making it functionally immutable.

--
MOS_MIGRATED_REVID=117492690

1 files changed, 1 insertions, 1 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/DependencyAndroidData.java b/src/tools/android/java/com/google/devtools/build/android/DependencyAndroidData.java
index e4bf85b932..74e7371fe3 100644
--- a/src/tools/android/java/com/google/devtools/build/android/DependencyAndroidData.java
+++ b/src/tools/android/java/com/google/devtools/build/android/DependencyAndroidData.java
@@ -207,7 +207,7 @@ class DependencyAndroidData {
     return new DependencyAndroidData(modifiedResources, modifiedAssets, manifest, rTxt, null);
   }
 
-  public void walk(final FileVisitor<Path> fileVisitor) throws IOException {
+  public void walkResources(final FileVisitor<Path> fileVisitor) throws IOException {
     for (Path path : resourceDirs) {
       Files.walkFileTree(
           path, ImmutableSet.of(FileVisitOption.FOLLOW_LINKS), Integer.MAX_VALUE, fileVisitor);