diff options
| -rw-r--r-- | build.gradle | 3 | ||||
| -rw-r--r-- | dexlib2/build.gradle | 28 |
2 files changed, 18 insertions, 13 deletions
diff --git a/build.gradle b/build.gradle index 32977047..76f9e22f 100644 --- a/build.gradle +++ b/build.gradle @@ -91,7 +91,8 @@ subprojects { commons_cli: 'commons-cli:commons-cli:1.2', jflex: 'de.jflex:jflex:1.4.3', jflex_plugin: 'co.tomlee.gradle.plugins:gradle-jflex-plugin:0.0.1', - proguard_gradle: 'net.sf.proguard:proguard-gradle:5.1' + proguard_gradle: 'net.sf.proguard:proguard-gradle:5.1', + dx: 'com.google.android.tools:dx:1.7' ] } diff --git a/dexlib2/build.gradle b/dexlib2/build.gradle index 9027132e..dc3e853a 100644 --- a/dexlib2/build.gradle +++ b/dexlib2/build.gradle @@ -31,6 +31,7 @@ configurations { accessorTestGenerator + dx } dependencies { @@ -41,6 +42,8 @@ dependencies { testCompile depends.junit accessorTestGenerator project('accessorTestGenerator') + + dx depends.dx } ext.testAccessorOutputDir = file("${buildDir}/generated-accessor-test-sources") @@ -69,23 +72,12 @@ task generateAccessorTestSource(type: JavaExec) { } compileTestJava.dependsOn generateAccessorTestSource -task generateAccessorTestDex(type: Exec, dependsOn: compileTestJava) { +task generateAccessorTestDex(type: JavaExec, dependsOn: compileTestJava) { def outputDex = file(new File(sourceSets.test.output.resourcesDir, 'accessorTest.dex')) doFirst { file(outputDex.parent).mkdirs() - } - - inputs.dir(project.sourceSets.test.output.classesDir) - outputs.file outputDex - - workingDir project.sourceSets.test.output.classesDir - executable 'dx' - args '--dex' - args '--no-strict' - args "--output=${outputDex}" - doFirst { // this has to be done in doFirst, so that the generated classes will be available. // otherwise, it the tree will be populated while the build is being configured, // which is before the compileTestJava has run @@ -95,6 +87,18 @@ task generateAccessorTestDex(type: Exec, dependsOn: compileTestJava) { args file } } + + inputs.dir(project.sourceSets.test.output.classesDir) + outputs.file outputDex + + main 'com.android.dx.command.Main' + classpath = configurations.dx + + workingDir project.sourceSets.test.output.classesDir + //executable 'dx' + args '--dex' + args '--no-strict' + args "--output=${outputDex}" } test.dependsOn generateAccessorTestDex |