commit 4707af81bc10bda1c4320288246170e444c69942
author Calin Juravle <calin@google.com> Thu Apr 13 16:35:42 2017 -0700
committer Calin Juravle <calin@google.com> Fri Apr 14 17:37:22 2017 -0700
tree cf719001b9beee4567b09976e6ad0295aa7bda6e
parent e2dfd30e752ed94944cb6f614f1a4cf18d038677

Print runtime isa when invoking 'dalvikvm --showversion'

The runtime ISA is appended at the end, after the version number.

Test: dalvikvm --showversion
Bug: 36824842
Change-Id: I09bbe3bf06054fe237543b5f96e9480631ea0838

runtime/parsed_options.cc

diff --git a/runtime/parsed_options.cc b/runtime/parsed_options.cc
index 0784e59..8ffd8bb 100644
--- a/runtime/parsed_options.cc
+++ b/runtime/parsed_options.cc
@@ -476,7 +476,10 @@
     Usage(nullptr);
     return false;
   } else if (args.Exists(M::ShowVersion)) {
-    UsageMessage(stdout, "ART version %s\n", Runtime::GetVersion());
+    UsageMessage(stdout,
+                 "ART version %s %s\n",
+                 Runtime::GetVersion(),
+                 GetInstructionSetString(kRuntimeISA));
     Exit(0);
   } else if (args.Exists(M::BootClassPath)) {
     LOG(INFO) << "setting boot class path to " << *args.Get(M::BootClassPath);