diff options
| author |  Adam Michael <ajmichael@google.com> | 2017-03-21 14:05:54 +0000 |
|---|---|---|
| committer |  Yue Gan <yueg@google.com> | 2017-03-22 10:53:02 +0000 |
| commit | 7478bda4640ed36c0e92456f63ceacb150b266b4 (patch) | |
| tree | a5cf86bb32d76a371dea89923550e8d9b46e9783 /src/tools/android/java/com/google/devtools/build/android/AarGeneratorAction.java | |
| parent | 8bd552261833a1887a281401c56d269c6594f8ef (diff) | |
Remove unused, unpassed AarGeneratorAction flag.
--
PiperOrigin-RevId: 150748157
MOS_MIGRATED_REVID=150748157
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/AarGeneratorAction.java')
| -rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/AarGeneratorAction.java | 7 |
1 files changed, 0 insertions, 7 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 2dea78e650..d616839b81 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 @@ -102,13 +102,6 @@ public class AarGeneratorAction { category = "output", 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", - help = "Merge strategy for resources.") - public boolean strictMerge; } public static void main(String[] args) { |