From d607960cffa1db7791601ad383cfd22f128a6ff5 Mon Sep 17 00:00:00 2001 From: Jeff Smith Date: Tue, 19 Nov 2013 08:31:52 -0600 Subject: [PATCH] baksmali: Reverse pair ordering in resource-id-files option --- baksmali/src/main/java/org/jf/baksmali/baksmaliOptions.java | 2 +- baksmali/src/main/java/org/jf/baksmali/main.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/baksmali/src/main/java/org/jf/baksmali/baksmaliOptions.java b/baksmali/src/main/java/org/jf/baksmali/baksmaliOptions.java index 92ec1135..197841c6 100644 --- a/baksmali/src/main/java/org/jf/baksmali/baksmaliOptions.java +++ b/baksmali/src/main/java/org/jf/baksmali/baksmaliOptions.java @@ -91,7 +91,7 @@ public class baksmaliOptions { public void setResourceIdFiles(String resourceIdFiles) { for (String resourceIdFile: resourceIdFiles.split(":")) { String[] entry = resourceIdFile.split("="); - resourceIdFileEntries.put(entry[0], entry[1]); + resourceIdFileEntries.put(entry[1], entry[0]); } } } diff --git a/baksmali/src/main/java/org/jf/baksmali/main.java b/baksmali/src/main/java/org/jf/baksmali/main.java index 03df4f6c..b5f8f856 100644 --- a/baksmali/src/main/java/org/jf/baksmali/main.java +++ b/baksmali/src/main/java/org/jf/baksmali/main.java @@ -441,9 +441,9 @@ public class main { .create("K"); Option resourceIdFilesOption = OptionBuilder.withLongOpt("resource-id-files") - .withDescription("the resource ID files to use, for analysis. A colon-separated list of file=prefix " + - "pairs. For example res/values/public.xml=R:" + - "$ANDROID_HOME/platforms/android-19/data/res/values/public.xml=android.R") + .withDescription("the resource ID files to use, for analysis. A colon-separated list of prefix=file " + + "pairs. For example R=res/values/public.xml:" + + "android.R=$ANDROID_HOME/platforms/android-19/data/res/values/public.xml") .hasArg() .withArgName("FILES") .create("R");