Merge remote-tracking branch 'aosp/upstream-master' into oth-merge-smali-upstream

Test: art/test.py
Bug: 33099829
Change-Id: I9d385a8ef526d5ab40990d7ad43e3390ab593f1b

1 files changed, 8 insertions, 0 deletions

diff --git a/baksmali/src/main/java/org/jf/baksmali/DisassembleCommand.java b/baksmali/src/main/java/org/jf/baksmali/DisassembleCommand.java
index 2e3eb79e..eb670df4 100644
--- a/baksmali/src/main/java/org/jf/baksmali/DisassembleCommand.java
+++ b/baksmali/src/main/java/org/jf/baksmali/DisassembleCommand.java
@@ -132,6 +132,10 @@ public class DisassembleCommand extends DexInputCommand {
                     "fields from the current class.")
     private boolean implicitReferences = false;
 
+    @Parameter(names = "--allow-odex-opcodes",
+            description = "Allows odex opcodes to be disassembled, even if the result won't be able to be reassembled.")
+    private boolean allowOdex = false;
+
     @Parameter(names = "--classes",
             description = "A comma separated list of classes. Only disassemble these classes")
     @ExtendedParameter(argumentNames = "classes")
@@ -282,6 +286,10 @@ public class DisassembleCommand extends DexInputCommand {
                     dexFile.getClasses());
         }
 
+        if (allowOdex) {
+            options.allowOdex = true;
+        }
+
         return options;
     }
 }