fixes iBotPeaches#427, correctly handles --frame-path on build

Author: iBotPeaches

CHANGES

@@ -5,6 +5,7 @@ v1.5.3 (TBA)
 -Updated to Gradle 1.4
 -Updated known bytes for configurations to 38 (from addition of layout direction)
 -Fixed NPE when handling odex apks even with --no-src specified. (Thanks Rodrigo Chiossi)
+-Fixed (issue #427) - Correctly handles `--frame-path` on [b]uild
 
 v1.5.2 (Released February 2 - 2013) Codename: Bug Fixes
 -Fixed (issue #299) - output smali filename errors to screen during rebuild instead of filestream

brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java

@@ -120,7 +120,9 @@ private static void cmdDecode(String[] args) throws InvalidArgsError,
 				decoder.setKeepBrokenResources(true);
 			} else if ("--frame-path".equals(opt)) {
 				i++;
-				System.out.println("Using Framework Directory: " + args[i]);
+        if (i >= args.length) {
+          throw new InvalidArgsError();
+        }
 				decoder.setFrameworkDir(args[i]);
 			} else {
 				throw new InvalidArgsError();
@@ -172,6 +174,8 @@ private static void cmdDecode(String[] args) throws InvalidArgsError,
 
 	private static void cmdBuild(String[] args) throws BrutException {
 
+	  Androlib instance = new Androlib();
+	  
 		// hold all the fields
 		HashMap<String, Boolean> flags = new HashMap<String, Boolean>();
 		flags.put("forceBuildAll", false);
@@ -199,6 +203,9 @@ private static void cmdBuild(String[] args) throws BrutException {
 			} else if ("-a".equals(opt) || "--aapt".equals(opt)) {
 				mAaptPath = args[i + 1];
 				skip = 1;
+			} else if ("--frame-path".equals(opt)) {
+			    i++;
+	        instance.setFrameworkFolder(args[i]);
 			} else if ("-o".equals(opt) || "--original".equals(opt)) {
 				if (args.length >= 4) {
 					throw new InvalidArgsError();
@@ -227,7 +234,7 @@ private static void cmdBuild(String[] args) throws BrutException {
 			throw new InvalidArgsError();
 		}
 
-		new Androlib().build(new File(appDirName), outFile, flags, mOrigApk,
+		instance.build(new File(appDirName), outFile, flags, mOrigApk,
 				mAaptPath);
 	}
 
@@ -331,6 +338,8 @@ private static void usage() {
 						+ "            Build in debug mode. Check project page for more info.\n"
 						+ "        -a, --aapt\n"
 						+ "            Loads aapt from specified location.\n"
+            + "        --frame-path <dir>\n"
+            + "            Use the specified directory for framework files\n"
 						+ "\n"
 						+ "    if|install-framework <framework.apk> [<tag>] --frame-path [<location>] \n"
 						+ "        Install framework file to your system.\n"

brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java

@@ -534,6 +534,10 @@ private File[] newFiles(String[] names, File dir) {
 	public void setApkFile(File apkFile) {
 		mOrigApkFile = new ExtFile(apkFile);
 	}
+	
+	public void setFrameworkFolder(String path) {
+	  mAndRes.setFrameworkFolder(path);
+	}
 
 	private ExtFile mOrigApkFile = null;
 	private String mAaptPath = null;

brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java

@@ -704,12 +704,11 @@ private File getFrameworkDir() throws AndrolibException {
 			path = sFrameworkFolder;
 		} else if (System.getProperty("os.name").equals("Mac OS X")) {
 			// store in user-home, for Mac OS X
-			path = System.getProperty("user.home") + File.separatorChar
-					+ "Library/apktool/framework";
+			path = System.getProperty("user.home") + File.separatorChar + "Library/apktool/framework";
 		} else {
-			path = System.getProperty("user.home") + File.separatorChar
-					+ "apktool" + File.separatorChar + "framework";
+			path = System.getProperty("user.home") + File.separatorChar + "apktool" + File.separatorChar + "framework";
 		}
+		
 		File dir = new File(path);
 		if (!dir.exists()) {
 			if (!dir.mkdirs()) {