aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Googler <noreply@google.com>2016-06-11 00:53:58 +0000
committerGravatar Yue Gan <yueg@google.com>2016-06-13 08:12:46 +0000
commitc69eaacc50e75a78950d1cfcef4230b7f2d1eedb (patch)
treee3f63ffa5c6f16df7d25828cfe428dd75eae48a3 /src
parent945e47914b63d0a2dbc319e20dbc9b0bd9dccc60 (diff)
fix crash that can happen when using incremental dexing *and* --android_crosstool_top due to a busted checkArgument condition
-- MOS_MIGRATED_REVID=124616411
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveProvider.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveProvider.java b/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveProvider.java
index ed75111cff..237f2a16ed 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveProvider.java
@@ -85,7 +85,7 @@ public class DexArchiveProvider implements TransitiveInfoProvider {
Artifact old =
dexArchives.put(
ImmutableSet.copyOf(dexopts), checkNotNull(dexedJar, "dexedJar"), dexArchive);
- checkArgument(old == null || old.equals(dexedJar),
+ checkArgument(old == null || old.equals(dexArchive),
"We already had mapping %s-%s for dexopts %s, so we don't also need %s",
dexedJar, old, dexopts, dexArchive);
return this;