Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adds support for predexing libraries to speed up dexing for application #161

Merged
merged 3 commits into from Jan 2, 2013
Merged

Adds support for predexing libraries to speed up dexing for application #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e5e599d
Adds support for predexing libraries to speed up dexing for application
sragu Dec 5, 2012
7c714d6
the predexed jars should also have jar extension for proper merge of …
sragu Dec 10, 2012
f91fcf4
changed the predex jar location to the target directory
sragu Dec 29, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/main/java/com/jayway/maven/plugins/android/configuration/Dex.java
View file
Open in desktop
Expand Up @@ -25,6 +25,10 @@ public class Dex
* Mirror of {@link com.jayway.maven.plugins.android.phase08preparepackage.DexMojo#dexOptimize}
*/
private Boolean optimize;
/**
* Mirror of {@link com.jayway.maven.plugins.android.phase08preparepackage.DexMojo#dexPreDex}
*/
private Boolean preDex;

public String[] getJvmArguments()
{
Expand All @@ -45,4 +49,9 @@ public Boolean isOptimize()
{
return optimize;
}

public Boolean isPreDex()
{
return preDex;
}
}
167 changes: 125 additions & 42 deletions src/main/java/com/jayway/maven/plugins/android/phase08preparepackage/DexMojo.java
View file
Open in desktop
Expand Up @@ -97,10 +97,18 @@ public class DexMojo extends AbstractAndroidMojo
*/
private boolean dexOptimize;

/**
* Decides whether to predex the jars.
*
* @parameter expression="${android.dex.predex}" default-value="false"
*/
private boolean dexPreDex;

private String[] parsedJvmArguments;
private boolean parsedCoreLibrary;
private boolean parsedNoLocals;
private boolean parsedOptimize;
private boolean parsedPreDex;

/**
*
Expand Down Expand Up @@ -213,67 +221,142 @@ private void parseConfiguration()
{
parsedOptimize = dex.isOptimize();
}
if ( dex.isPreDex() == null )
{
parsedPreDex = dexPreDex;
}
else
{
parsedPreDex = dex.isPreDex();
}
}
else
{
parsedJvmArguments = dexJvmArguments;
parsedCoreLibrary = dexCoreLibrary;
parsedNoLocals = dexNoLocals;
parsedOptimize = dexOptimize;
parsedPreDex = dexPreDex;
}
}

private void runDex( CommandExecutor executor, File outputFile, Set<File> inputFiles ) throws MojoExecutionException
private Set<File> preDex( CommandExecutor executor, Set<File> inputFiles ) throws MojoExecutionException
{
Set<File> filtered = new HashSet();
getLog().info( "Pre dex-ing libraries for faster dex-ing of the final application." );

for ( File inputFile : inputFiles )
{
List<String> commands = new ArrayList<String>();
if ( parsedJvmArguments != null )
{
for ( String jvmArgument : parsedJvmArguments )
{
// preserve backward compatibility allowing argument with or without dash (e.g. Xmx512m as well as
// -Xmx512m should work) (see http://code.google.com/p/maven-android-plugin/issues/detail?id=153)
if ( ! jvmArgument.startsWith( "-" ) )
{
jvmArgument = "-" + jvmArgument;
}
getLog().debug( "Adding jvm argument " + jvmArgument );
commands.add( jvmArgument );
}
}
commands.add( "-jar" );
commands.add( getAndroidSdk().getPathForTool( "dx.jar" ) );
commands.add( "--dex" );
if ( ! parsedOptimize )
{
commands.add( "--no-optimize" );
}
if ( parsedCoreLibrary )
{
commands.add( "--core-library" );
}
commands.add( "--output=" + outputFile.getAbsolutePath() );
if ( parsedNoLocals )
{
commands.add( "--no-locals" );
}
if ( inputFile.getName().matches( ".*\\.jar$" ) )
{
List<String> commands = dexDefaultCommands();

for ( File inputFile : inputFiles )
{
getLog().debug( "Adding dex input: " + inputFile.getAbsolutePath() );
commands.add( inputFile.getAbsolutePath() );
}
File predexJar = predexJarPath( inputFile );
commands.add( "--output=" + predexJar.getAbsolutePath() );
commands.add( inputFile.getAbsolutePath() );
filtered.add( predexJar );

final String javaExecutable = getJavaExecutable().getAbsolutePath();
getLog().info( javaExecutable + " " + commands.toString() );
try
if ( !predexJar.isFile() || predexJar.lastModified() < inputFile.lastModified() )
{
getLog().info( "Pre-dex ing jar: " + inputFile.getAbsolutePath() );

final String javaExecutable = getJavaExecutable().getAbsolutePath();
getLog().info( javaExecutable + " " + commands.toString() );
try
{
executor.executeCommand( javaExecutable, commands, project.getBasedir(), false );
}
catch ( ExecutionException e )
{
throw new MojoExecutionException( "", e );
}
}
catch ( ExecutionException e )

}
else
{
filtered.add( inputFile );
}
}

return filtered;
}

private File predexJarPath( File inputFile )
{
final String slash = File.separator;
final File predexLibsDirectory = new File( project.getBuild().getDirectory() + slash + "dexedLibs" );
predexLibsDirectory.mkdirs();
return new File( predexLibsDirectory.getAbsolutePath() + slash + inputFile.getName() );
}

private List<String> dexDefaultCommands() throws MojoExecutionException
{

List<String> commands = new ArrayList<String>();
if ( parsedJvmArguments != null )
{
for ( String jvmArgument : parsedJvmArguments )
{
// preserve backward compatibility allowing argument with or without dash (e.g. Xmx512m as well as
// -Xmx512m should work) (see http://code.google.com/p/maven-android-plugin/issues/detail?id=153)
if ( !jvmArgument.startsWith( "-" ) )
{
throw new MojoExecutionException( "", e );
jvmArgument = "-" + jvmArgument;
}
getLog().debug( "Adding jvm argument " + jvmArgument );
commands.add( jvmArgument );
}
}
commands.add( "-jar" );
commands.add( getAndroidSdk().getPathForTool( "dx.jar" ) );
commands.add( "--dex" );


return commands;

}

private void runDex( CommandExecutor executor, File outputFile, Set<File> inputFiles ) throws MojoExecutionException
{
List<String> commands = dexDefaultCommands();
Set<File> filteredFiles = inputFiles;

if ( parsedPreDex )
{
filteredFiles = preDex( executor, inputFiles );
}
if ( !parsedOptimize )
{
commands.add( "--no-optimize" );
}
if ( parsedCoreLibrary )
{
commands.add( "--core-library" );
}
commands.add( "--output=" + outputFile.getAbsolutePath() );
if ( parsedNoLocals )
{
commands.add( "--no-locals" );
}

for ( File inputFile : filteredFiles )
{
getLog().debug( "Adding dex input: " + inputFile.getAbsolutePath() );
commands.add( inputFile.getAbsolutePath() );
}

final String javaExecutable = getJavaExecutable().getAbsolutePath();
getLog().info( javaExecutable + " " + commands.toString() );
try
{
executor.executeCommand( javaExecutable, commands, project.getBasedir(), false );
}
catch ( ExecutionException e )
{
throw new MojoExecutionException( "", e );
}
}

/**
* Figure out the full path to the current java executable.
Expand Down