diff options
| author | Sven Gothel <[email protected]> | 2014-02-21 12:26:30 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2014-02-21 12:26:30 +0100 |
| commit | 3c29aebb4910858df66cc54d186623f1bb7eff04 (patch) | |
| tree | c4a23e0dc986467cbc2b237663a7b5494ead362a /make | |
| parent | 4447232af0d95a4348d09d4ed03fbef48394ca3a (diff) | |
build-test.xml: Push 'java.generate' up from java.build to android.package
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-test.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index 31dc773..932d964 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -109,7 +109,7 @@ </target> - <target name="java.build" depends="java.generate"> + <target name="java.build"> <echo message=" - - - compiling all java files - - - "/> <echo message=" test.base.dir ${test.base.dir}"/> <echo message=" build_t.gen ${build_t.gen}"/> @@ -160,7 +160,7 @@ </jar> </target> - <target name="android.package" depends="java.build,native.build" if="isAndroid"> + <target name="android.package" depends="java.generate,java.build,native.build" if="isAndroid"> <aapt.signed assetsdir="resources/assets-test" jarbuilddir="${build_t}" @@ -243,7 +243,7 @@ <target name="junit.compile" depends="junit.compile.check" unless="junit.compile.skip"> <mkdir dir="${build}/test/build/classes"/> - <antcall target="android.package" inheritRefs="true"/> <!-- implies java.build --> + <antcall target="android.package" inheritRefs="true"/> <!-- implies java.generate,java.build --> <antcall target="dump.localinfo" inheritRefs="true"/> </target> |