aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/java/com/google/devtools/build/android/dexer/DexFileMergerTest.java
diff options
context:
space:
mode:
authorGravatar kmb <kmb@google.com>2017-09-28 15:14:24 -0400
committerGravatar John Cater <jcater@google.com>2017-09-29 12:14:10 -0400
commit98fbf51a30adc225a1900ca13db835244aeb0588 (patch)
tree8eb6c8da426c3903d4e739485662a88da1d4a011 /src/test/java/com/google/devtools/build/android/dexer/DexFileMergerTest.java
parent64cb229b324444ed24c067dce42cdeea787e4728 (diff)
Support --positions flag in DexBuilder, for consistency with dx
RELNOTES: none PiperOrigin-RevId: 170379445
Diffstat (limited to 'src/test/java/com/google/devtools/build/android/dexer/DexFileMergerTest.java')
-rw-r--r--src/test/java/com/google/devtools/build/android/dexer/DexFileMergerTest.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/test/java/com/google/devtools/build/android/dexer/DexFileMergerTest.java b/src/test/java/com/google/devtools/build/android/dexer/DexFileMergerTest.java
index 38c7f4f5a9..7ea6231d29 100644
--- a/src/test/java/com/google/devtools/build/android/dexer/DexFileMergerTest.java
+++ b/src/test/java/com/google/devtools/build/android/dexer/DexFileMergerTest.java
@@ -20,6 +20,7 @@ import static org.junit.Assert.fail;
import com.android.dex.ClassDef;
import com.android.dex.Dex;
import com.android.dx.command.dexer.DxContext;
+import com.android.dx.dex.code.PositionList;
import com.google.common.base.Function;
import com.google.common.base.Predicates;
import com.google.common.collect.HashMultimap;
@@ -292,7 +293,10 @@ public class DexFileMergerTest {
options.outputZip =
FileSystems.getDefault().getPath(System.getenv("TEST_TMPDIR"), "libtests.dex.zip");
options.maxThreads = 1;
- DexBuilder.buildDexArchive(options, new Dexing(new DxContext(), new Dexing.DexingOptions()));
+ Dexing.DexingOptions dexingOptions = new Dexing.DexingOptions();
+ dexingOptions.optimize = true;
+ dexingOptions.positionInfo = PositionList.LINES;
+ DexBuilder.buildDexArchive(options, new Dexing(new DxContext(), dexingOptions));
return options.outputZip;
}