diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-01-25 22:12:09 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-01-28 23:34:02 +0100 |
| commit | d0665e0c5ce168adbe891b74ee25e0fcd3051ae9 (patch) | |
| tree | 3bfb409fbc8b1811c8fd19b7290f7b47dcc42c77 | |
| parent | 000a2f91edbe638090dc577801ba49592229fd8b (diff) | |
| download | toolchain_jack-d0665e0c5ce168adbe891b74ee25e0fcd3051ae9.zip toolchain_jack-d0665e0c5ce168adbe891b74ee25e0fcd3051ae9.tar.gz toolchain_jack-d0665e0c5ce168adbe891b74ee25e0fcd3051ae9.tar.bz2 | |
use ddmlib and freemarker from system
get rid of dx-ref jar and dist-check dependency
Change-Id: Id9e235002fa721923f13c546d04107114b94b2c9
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
| -rw-r--r-- | build.xml | 11 | ||||
| l---------[-rw-r--r--] | ddmlib/ddmlib.jar | bin | 251343 -> 37 bytes | |||
| -rw-r--r-- | dx-ref/dx.jar | bin | 963559 -> 0 bytes | |||
| -rw-r--r-- | freemarker/freemarker-2.3.19.jar | bin | 931168 -> 0 bytes | |||
| l--------- | freemarker/freemarker.jar | 1 |
5 files changed, 3 insertions, 9 deletions
@@ -106,14 +106,8 @@ <delete dir="${jack-top-dist.dir}"/> </target> - <target name="dist-check"> - <fail message="dist.sha is undefined" unless="dist.sha" /> - <fail message="dist.build-id is undefined" unless="dist.build-id" /> - </target> - <target name="dist" description="package a Jack distribution" depends=" - dist-check, jack, jack-api, jack-api-src, @@ -197,7 +191,7 @@ </target> <target name="jack-copy-libs" depends="ecj,guava-lib,dx-lib,args4j-lib,antlr-rt-lib,jsr305-lib, - junit4,dex-lib,dx-ref-lib,jack-api-lib"> + junit4,dex-lib,jack-api-lib"> <copy todir="${jack.libs.dir}" flatten="true"> <filelist dir="/" > <file name="${ecj.dist.dir}/${ecj.libname}"/> @@ -208,7 +202,6 @@ <file name="${jsr305.dist.dir}/${jsr305.libname}"/> <file name="${junit4.dist.dir}/${junit4.execname}"/> <file name="${dexlib.dist.dir}/${dexlib.libname}"/> - <file name="${dx-ref.dist.dir}/${dx-ref.libname}"/> <file name="${jack-api.dist.dir}/${jack-api.lib.name}"/> </filelist> </copy> @@ -1030,7 +1023,7 @@ <target name="freemarker-lib"> <mkdir dir="${freemarker.dist.dir}"/> - <copy file="${freemarker.dir}/freemarker-2.3.19.jar" tofile="${freemarker.dist.dir}/${freemarker.libname}"/> + <copy file="${freemarker.dir}/freemarker.jar" tofile="${freemarker.dist.dir}/${freemarker.libname}"/> </target> diff --git a/ddmlib/ddmlib.jar b/ddmlib/ddmlib.jar Binary files differindex 5b9e8bb..5347180 100644..120000 --- a/ddmlib/ddmlib.jar +++ b/ddmlib/ddmlib.jar diff --git a/dx-ref/dx.jar b/dx-ref/dx.jar Binary files differdeleted file mode 100644 index 5039f30..0000000 --- a/dx-ref/dx.jar +++ /dev/null diff --git a/freemarker/freemarker-2.3.19.jar b/freemarker/freemarker-2.3.19.jar Binary files differdeleted file mode 100644 index b13671d..0000000 --- a/freemarker/freemarker-2.3.19.jar +++ /dev/null diff --git a/freemarker/freemarker.jar b/freemarker/freemarker.jar new file mode 120000 index 0000000..b2e252d --- /dev/null +++ b/freemarker/freemarker.jar @@ -0,0 +1 @@ +/usr/share/java/freemarker.jar
\ No newline at end of file |