Renamed to generateRForApkLibDependency() for clarity.

pyricau · Mar 4, 2011 · 15faa5c · 15faa5c
1 parent 76ae384
commit 15faa5c
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/...ain/java/com/jayway/maven/plugins/android/phase01generatesources/GenerateSourcesMojo.java b/...ain/java/com/jayway/maven/plugins/android/phase01generatesources/GenerateSourcesMojo.java
@@ -418,20 +418,20 @@ private void generateApklibR() throws MojoExecutionException {
 
         apkLibGen.mkdirs();
 
-//		generateRForManifest(androidManifestFile.getAbsolutePath());
+//		generateRForApkLibDependency(androidManifestFile.getAbsolutePath());
 
 		for (Artifact artifact : getAllRelevantDependencyArtifacts()) {
 			if (artifact.getType().equals(APKLIB)) {
-				generateRForManifest(getLibraryUnpackDirectory(artifact) + "/" + "AndroidManifest.xml");
+				generateRForApkLibDependency(getLibraryUnpackDirectory(artifact) + "/" + "AndroidManifest.xml");
 			}
 		}
 
 		project.addCompileSourceRoot(genDirectory.getAbsolutePath());
 
 	}
 
-	private void generateRForManifest(String pathToManifest) throws MojoExecutionException {
-		getLog().debug("Generating R file for apklibrary: " + pathToManifest);
+	private void generateRForApkLibDependency(String pathToApkLibAndroidManifest) throws MojoExecutionException {
+		getLog().debug("Generating R file for apklibrary: " + pathToApkLibAndroidManifest);
 
 
 		CommandExecutor executor = CommandExecutor.Factory.createDefaultCommmandExecutor();
@@ -443,7 +443,7 @@ private void generateRForManifest(String pathToManifest) throws MojoExecutionExc
 		commands.add("-J");
 		commands.add(apkLibGen.getAbsolutePath());
 		commands.add("-M");
-		commands.add(pathToManifest);
+		commands.add(pathToApkLibAndroidManifest);
 		commands.add("-S");
 		commands.add(resourceDirectory.getAbsolutePath());
 		for (Artifact artifact: getAllRelevantDependencyArtifacts()) {