diff options
| -rw-r--r-- | build.xml | 19 | ||||
| -rw-r--r-- | jack-tests/src/com/android/jack/test/toolchain/JackApiToolchainBase.java | 3 |
2 files changed, 20 insertions, 2 deletions
@@ -20,6 +20,7 @@ <target name="dist" depends="dexcomparator-lib, jack, jack-api, + jack-api-src, jackunittests, jack-tests, dx-lib, @@ -28,6 +29,7 @@ <target name="clean" depends="jack-clean, jack-api-lib-clean, + jack-api-src-clean, jackunittests-lib-clean, jackunittests-clean, jack-tests-clean, @@ -254,6 +256,7 @@ <file name="${jsr305.dist.dir}/${jsr305.libname}"/> </filelist> </classpath> + <exclude name="com/android/jack/api/example/**"/> </javac> <jar destfile="${jack-api.dist.dir}/${jack-api.lib.name}"> <fileset dir="${jack-api.lib.build.outdir}"/> @@ -275,6 +278,22 @@ </jar> </target> + + <!-- ******************* --> + <!-- jack-api-src --> + <!-- ******************* --> + <property name="jack-api-src.name" value="jack-api-src.zip" /> + + <target name="jack-api-src-clean"> + <delete dir="${jack-api.dist.dir}/${jack-api-src.name}"/> + </target> + + <target name="jack-api-src"> + <zip destfile="${jack-api.dist.dir}/${jack-api-src.name}" + basedir="${jack-api.dir}/src" /> + </target> + + <!-- ******************* --> <!-- jackunittests-lib --> <!-- ******************* --> diff --git a/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchainBase.java b/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchainBase.java index 33fb3ddf..f0085619 100644 --- a/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchainBase.java +++ b/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchainBase.java @@ -19,7 +19,6 @@ package com.android.jack.test.toolchain; import com.android.jack.api.ConfigNotSupportedException; import com.android.jack.api.JackConfig; import com.android.jack.api.JackConfigProvider; -import com.android.jack.api.example.Main; import com.android.jack.api.v01.VerbosityLevel; import com.android.jack.shrob.spec.Flags; import com.android.jack.test.TestConfigurationException; @@ -77,7 +76,7 @@ public abstract class JackApiToolchainBase extends JackBasedToolchain { ClassLoader loader; JackConfigProvider confProvider; loader = URLClassLoader.newInstance(new URL[] {jackPrebuilt.toURI().toURL()}, - Main.class.getClassLoader()); + JackApiToolchainBase.class.getClassLoader()); Class<? extends JackConfigProvider> confProviderClass = Class.forName( JackConfigProvider.CLASS_NAME, true, loader).asSubclass(JackConfigProvider.class); |