Fix the offset discrepancy for --dump-method-and-offset-as-json.

Bug: 154812810
Test: oatdump --oat-file=/system/framework/oat/x86_64/services.odex \
  --dump-method-and-offset-as-json
Change-Id: Idd9a1b63279218d4d44aa42c66129c884e30fdf0

1 files changed, 3 insertions, 2 deletions

diff --git a/oatdump/oatdump.cc b/oatdump/oatdump.cc
index 1afd606f7d..150bdae416 100644
--- a/oatdump/oatdump.cc
+++ b/oatdump/oatdump.cc
@@ -721,8 +721,9 @@ class OatDumper {
 
           std::string pretty_method = dex_file->PrettyMethod(dex_method_idx, true);
 
-          os << StringPrintf(
-              "{\"method\":\"%s\",\"offset\":\"0x%08x\"}\n", pretty_method.c_str(), code_offset);
+          os << StringPrintf("{\"method\":\"%s\",\"offset\":\"0x%08zx\"}\n",
+                             pretty_method.c_str(),
+                             AdjustOffset(code_offset));
         }
       }
     }