|
@ -37,12 +37,11 @@
|
37
|
37
|
<property name="host-bin" value="${project_home}/${bin-dir}" />
|
38
|
38
|
<property name="host-build" value="${project_home}/${build-dir}" />
|
39
|
39
|
<property name="host-classes" value="${host-bin}/classes" />
|
40
|
|
<property name="intermediate-dex" value="${project_home}/${build-dir}/classes.dex" />
|
41
|
|
<property name="intermediate-dex2" value="classes2.dex" />
|
42
|
|
<property name="intermediate-dex-dir" value="${project_home}/${build-dir}" />
|
|
40
|
<property name="intermediate-dex" value="${project_home}/${bin-dir}/${app_name}/classes.dex" />
|
|
41
|
<property name="intermediate-dex-dir" value="${project_home}/${bin-dir}/${app_name}" />
|
43
|
42
|
<!-- The final package file to generate -->
|
44
|
43
|
<property name="resources-package" value="${project_home}/${bin-dir}/${app_name}/${app_name}.ap_" />
|
45
|
|
<property name="out-unsigned-package" value="${project_home}/${build-dir}/${app_name}-unsigned.apk" />
|
|
44
|
<property name="out-unsigned-package" value="${project_home}/${bin-dir}/${app_name}/${app_name}-unsigned.apk" />
|
46
|
45
|
<property name="out-signed-package" value="${project_home}/${bin-dir}/${app_name}/${app_name}-signed.apk" />
|
47
|
46
|
<property name="zipalign-package" value="${output_path}/${app_name}.apk" />
|
48
|
47
|
|
|
@ -288,14 +287,32 @@
|
288
|
287
|
</java>
|
289
|
288
|
</target>
|
290
|
289
|
|
291
|
|
<!-- add classes2 -->
|
|
290
|
<!-- add classes2.dex class3.dex ... -->
|
292
|
291
|
<target name="add-dex">
|
293
|
|
<echo>Add classes2...</echo>
|
294
|
|
<exec executable="${aapt}" failonerror="true" >
|
295
|
|
<arg value="add" />
|
296
|
|
<arg value="${out-unsigned-package}" />
|
297
|
|
<arg value="${intermediate-dex2}" />
|
298
|
|
</exec>
|
|
292
|
<echo>Add classes*.dex...</echo>
|
|
293
|
|
|
294
|
<for param="file">
|
|
295
|
<fileset dir="${intermediate-dex-dir}" includes="classes*.dex"
|
|
296
|
excludes="classes.dex"/>
|
|
297
|
<sequential>
|
|
298
|
<copy file="@{file}" todir="." />
|
|
299
|
<propertyregex
|
|
300
|
property="dexfile"
|
|
301
|
input="@{file}"
|
|
302
|
regexp="classes.*\.dex"
|
|
303
|
select="\0"
|
|
304
|
casesensitive="false" />
|
|
305
|
<echo>add ${dexfile} to apk</echo>
|
|
306
|
<exec executable="${aapt}" failonerror="true" >
|
|
307
|
<arg value="add" />
|
|
308
|
<arg value="${out-unsigned-package}" />
|
|
309
|
<arg value="${dexfile}" />
|
|
310
|
</exec>
|
|
311
|
</sequential>
|
|
312
|
</for>
|
|
313
|
<delete>
|
|
314
|
<fileset dir="." includes="class*.dex" />
|
|
315
|
</delete>
|
299
|
316
|
</target>
|
300
|
317
|
|
301
|
318
|
<!-- APK签名 -->
|