diff options
author | Liam Miller-Cushon <cushon@google.com> | 2016-12-21 23:06:28 +0000 |
---|---|---|
committer | Klaus Aehlig <aehlig@google.com> | 2016-12-22 09:57:10 +0000 |
commit | ac007764cbb2fb30ce6458a357fb0988d08bbfd3 (patch) | |
tree | 652fcc7470df91fa9d720fca5157ff9117c4143c | |
parent | 87fd5baeaa3f983bbec0c0dbc7b16eb52cf2267f (diff) |
Stop passing --no-locals to dx for coverage builds
This caused problems with Emma, but we have since migrated to JaCoCo
which has better support for local variable tables.
--
PiperOrigin-RevId: 142705846
MOS_MIGRATED_REVID=142705846
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java index 63a43483d1..159ca75366 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java @@ -202,13 +202,6 @@ public class AndroidCommon { Artifact mainDexList) { List<String> args = new ArrayList<>(); args.add("--dex"); - // Add --no-locals to coverage builds. Older coverage tools don't correctly preserve local - // variable information in stack frame maps that are required since Java 7, so to avoid runtime - // errors we just don't add local variable info in the first place. This may no longer be - // necessary, however, as long as we use a coverage tool that generates stack frame maps. - if (ruleContext.getConfiguration().isCodeCoverageEnabled()) { - args.add("--no-locals"); // TODO(bazel-team): Is this still needed? - } // Multithreaded dex does not work when using --multi-dex. if (!multidex) { |