From cf0131406d31610c9e7a8e9c2aef6c1ffcf711cc Mon Sep 17 00:00:00 2001 From: Raphael Date: Mon, 15 Jun 2009 13:36:11 -0700 Subject: [PATCH] Modify archquery to be able to print any system property. (this is change 4207 that was abandoned due to a merge conflict.) --- .../src/com/android/archquery/Main.java | 33 +++++++++++-------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/tools/archquery/src/com/android/archquery/Main.java b/tools/archquery/src/com/android/archquery/Main.java index 5e65ff289..c76cca122 100644 --- a/tools/archquery/src/com/android/archquery/Main.java +++ b/tools/archquery/src/com/android/archquery/Main.java @@ -45,21 +45,28 @@ package com.android.archquery; */ public final class Main { public static void main(String[] args) { - // Values listed from http://lopica.sourceforge.net/os.html - String arch = System.getProperty("os.arch"); - if (arch.equalsIgnoreCase("x86_64") || arch.equalsIgnoreCase("amd64")) { - System.out.print("x86_64"); + for (String arg : args) { + System.out.println(String.format("%1$s: %2$s", arg, System.getProperty(arg))); + } - } else if (arch.equalsIgnoreCase("x86") - || arch.equalsIgnoreCase("i386") - || arch.equalsIgnoreCase("i686")) { - System.out.print("x86"); + if (args.length == 0) { + // Values listed from http://lopica.sourceforge.net/os.html + String arch = System.getProperty("os.arch"); - } else if (arch.equalsIgnoreCase("ppc") || arch.equalsIgnoreCase("PowerPC")) { - System.out.print("ppc"); - } else { - System.out.print(arch); + if (arch.equalsIgnoreCase("x86_64") || arch.equalsIgnoreCase("amd64")) { + System.out.print("x86_64"); + + } else if (arch.equalsIgnoreCase("x86") + || arch.equalsIgnoreCase("i386") + || arch.equalsIgnoreCase("i686")) { + System.out.print("x86"); + + } else if (arch.equalsIgnoreCase("ppc") || arch.equalsIgnoreCase("PowerPC")) { + System.out.print("ppc"); + } else { + System.out.print(arch); + } } } -} \ No newline at end of file +}