Merge "DexMerger: Workaround for buffer overflow in tests"
diff --git a/dx/src/com/android/dx/merge/DexMerger.java b/dx/src/com/android/dx/merge/DexMerger.java
index 0747603..e3279a2 100644
--- a/dx/src/com/android/dx/merge/DexMerger.java
+++ b/dx/src/com/android/dx/merge/DexMerger.java
@@ -1144,8 +1144,10 @@
encodedArray += contents.encodedArrays.byteCount * 2;
// all of the bytes in an annotations section may be uleb/sleb
annotation += (int) Math.ceil(contents.annotations.byteCount * 2);
- // all of the bytes in a debug info section may be uleb/sleb
- debugInfo += contents.debugInfos.byteCount * 2;
+ // all of the bytes in a debug info section may be uleb/sleb. The additive constant
+ // is a fudge factor observed to be required when merging small
+ // DEX files (b/68483205).
+ debugInfo += contents.debugInfos.byteCount * 2 + 8;
}
}
diff --git a/dx/tests/run-all-tests b/dx/tests/run-all-tests
index 316cecd..d24ef7a 100755
--- a/dx/tests/run-all-tests
+++ b/dx/tests/run-all-tests
@@ -33,7 +33,7 @@
progdir=`pwd`
prog="${progdir}"/`basename "${prog}"`
-skip_tests="127-merge-stress"
+skip_tests=""
# Command-line options
sequential="no"
