Remove dependency data from AarGeneratorAction

It's not supposed to cover direct deps and trans
deps according to the documentation anyway. Also
prepare to move the --strictMerge flag. The
option isn't checked anymore. There's only one
type of merging.

--
MOS_MIGRATED_REVID=132444314

1 files changed, 5 insertions, 16 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 e1175115bc..933341238d 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
@@ -20,7 +20,6 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Joiner;
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.ImmutableList;
-import com.google.devtools.build.android.Converters.DependencyAndroidDataListConverter;
 import com.google.devtools.build.android.Converters.ExistingPathConverter;
 import com.google.devtools.build.android.Converters.PathConverter;
 import com.google.devtools.build.android.Converters.UnvalidatedAndroidDataConverter;
@@ -50,13 +49,10 @@ import java.util.zip.ZipOutputStream;
  * <pre>
  * Example Usage:
  *   java/com/google/build/android/AarGeneratorAction\
- *      --primaryData path/to/resources:path/to/assets:path/to/manifest\
- *      --data p/t/res1:p/t/assets1:p/t/1/AndroidManifest.xml:p/t/1/R.txt,\
- *             p/t/res2:p/t/assets2:p/t/2/AndroidManifest.xml:p/t/2/R.txt\
+ *      --mainData path/to/resources:path/to/assets:path/to/manifest\
  *      --manifest path/to/manifest\
  *      --rtxt path/to/rtxt\
  *      --classes path/to/classes.jar\
- *      --strictMerge\
  *      --aarOutput path/to/write/archive.aar
  * </pre>
  */
@@ -76,16 +72,6 @@ public class AarGeneratorAction {
             + "merging. The expected format is resources[#resources]:assets[#assets]:manifest")
     public UnvalidatedAndroidData mainData;
 
-    @Option(name = "dependencyData",
-        defaultValue = "",
-        converter = DependencyAndroidDataListConverter.class,
-        category = "input",
-        help = "Additional Data dependencies. These values will be used if not defined in "
-            + "the primary resources. The expected format is "
-            + DependencyAndroidData.EXPECTED_FORMAT
-            + "[,...]")
-    public List<DependencyAndroidData> dependencyData;
-
     @Option(name = "manifest",
         defaultValue = "null",
         converter = ExistingPathConverter.class,
@@ -114,6 +100,7 @@ public class AarGeneratorAction {
         help = "Path to write the archive.")
     public Path aarOutput;
 
+    // TODO: remove once blaze stops sending "--nostrictMerge" (since this is unused).
     @Option(name = "strictMerge",
         defaultValue = "true",
         category = "option",
@@ -139,10 +126,12 @@ public class AarGeneratorAction {
       Path assetsOut = tmp.resolve("merged_assets");
       Files.createDirectories(assetsOut);
       logger.fine(String.format("Setup finished at %dms", timer.elapsed(TimeUnit.MILLISECONDS)));
+      // 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(
               options.mainData,
-              options.dependencyData,
+              ImmutableList.<DependencyAndroidData>of(),
               ImmutableList.<DependencyAndroidData>of(),
               resourcesOut,
               assetsOut,