完善ant打包脚本

display-client/build/build.xml

@@ -2,7 +2,7 @@
<project name="apkTargets" default="apkpackaging"  basedir=".">
	<taskdef resource="net/sf/antcontrib/antlib.xml"/>
	<!-- 指定配置文件 -->  
    <property file="build.properties" /> 
    <property file="build.properties" />
    <record name="${log_file}" loglevel="info" append="no" action="start" />
	<!-- 识别编译环境 -->
	<condition property="exe" value=".exe" else=""><os family="windows" /></condition>
@@ -62,30 +62,27 @@
  	<target name="aapt_gererateR">
		<foreach target="aapt_gererateR_library" list="${libraries}" param="library" delimiter=",">
		</foreach>
  		<!--
        <!-- auto-add-overlay 这个重要，覆盖资源，不然报错-->
        <var name="p" value="package -m --auto-add-overlay -J ${host-gen} -M ${project_home}/${manifest-xml}
			-I ${android-jar} -S ${project_home}/${res-dir}"/>
  		<for list="${libraries}" param="library">
            <sequential>
            	<available property="isExist_library_res" file="${library}/res" type="dir" />
            	<available property="isExist_library_res" file="@{library}/res" type="dir" />
    			<if>
    			    <equals arg1="${isExist_library_res}" arg2="true" />
    			    <then>
    			    	<isset property="library_param"/>
    			    	-S ${library}/${res-dir}
	
                        <var name="p" value="${p} -S @{library}/${res-dir}"/>
    			    </then>
    			</if>
            </sequential>
        </for>
		-->
  		<!-- auto-add-overlay 这个重要，覆盖资源，不然报错-->
		<var name="param" value="package -m --auto-add-overlay -J ${host-gen} -M ${project_home}/${manifest-xml} 
			-I ${android-jar} -S ${project_home}/${res-dir} -S ${library_1}/${res-dir}"/>
  		
  		<mkdir dir="${library}/gen"/><!--仓库通常忽略此目录-->
		<echo>aapt_gererateR param：${param}</echo>
		<!-- 编译工程的的R文件 -->
		<exec executable="${aapt}" failonerror="true">
            <arg line="${param}" />
            <arg line="${p}" />
        </exec>
    </target>
	
@@ -103,12 +100,12 @@
			</else>
		</if>
		
		<var name="param" value="package -m --non-constant-id --auto-add-overlay -J ${library}/gen 
		<var name="param" value="package -m --non-constant-id --auto-add-overlay -J ${host-gen}
			-M ${library}/${manifest-xml} -I ${android-jar} ${param}"/>
		<echo>aapt_gererateR_library param：${param}</echo>
		
		<mkdir dir="${library}/gen"/>  
		
		<mkdir dir="${library}/gen"/>
		<!-- 编译Libray的R文件 -->
		<exec executable="${aapt}" failonerror="true">
            <arg line="${param}" />
@@ -129,48 +126,46 @@
    
	<!-- 编译java文件为class文件 -->
	<target name="compile">
		<path id="project.libs">
	        <fileset dir="${project_home}/${libs-dir}">
	            <include name="*.so" />
	            <include name="**/*.so" />
	            <include name="*/*.so" />
	            <include name="**/*.jar" />
	            <include name="*.jar" />
	        </fileset>
		</path>
	      
	  	<path id="library1.libs">
	         <fileset dir="${library_1}/libs">
	             <include name="*.so" />
	             <include name="**/*.so" />
	             <include name="*/*.so" />
	             <include name="**/*.jar" />
	             <include name="*.jar" />
	         </fileset>
	    </path>
	    
	  	<path id="library2.libs">
	          <fileset dir="${library_2}/libs">
	              <include name="*.so" />
	              <include name="**/*.so" />
	              <include name="*/*.so" />
	              <include name="**/*.jar" />
	              <include name="*.jar" />
	          </fileset>
	    </path>
	    
		<javac debug="true" extdirs="" srcdir="." includeantruntime="on" 
	        destdir="${host-classes}" bootclasspath="${android-jar}" encoding="UTF-8" 
			source="${jdk_version}" target="${jdk_version}" >
	          <compilerarg line="-encoding UTF-8 " />
	          <src path="${host-src}" />
	          <src path="${host-gen}" />
	          <!--<src path="${library_1}/${src-dir}" />--><!-- Library1的src文件 -->
			  <!--<src path="${library_2}/${src-dir}" />--><!-- Library2的src文件 -->
			  <!-- jar文件 -->          
	          <classpath refid="library1.libs" />
	          <classpath refid="library2.libs" />
		</javac>
        <copydir src="${project_home}/libs"
                 dest="${host-bin}/libs"
            />
        <for list="${libraries}" param="library">
            <sequential>
                <available property="isExist_library_libs" file="@{library}/libs" type="dir" />
                <if>
                    <equals arg1="${isExist_library_libs}" arg2="true" />
                    <then>
                        <copydir src="@{library}/libs"
                                 dest="${host-bin}/libs"
                            />
                    </then>
                </if>
            </sequential>
        </for>
        <path id="library.libs">
            <fileset dir="${host-bin}/libs">
                <include name="*.so" />
                <include name="**/*.so" />
                <include name="*/*.so" />
                <include name="**/*.jar" />
                <include name="*.jar" />
            </fileset>
        </path>
        <javac debug="true" extdirs="" srcdir="." includeantruntime="on"
               destdir="${host-classes}" bootclasspath="${android-jar}" encoding="UTF-8"
               source="${jdk_version}" target="${jdk_version}" >
            <compilerarg line="-encoding UTF-8 " />
            <src path="${host-src}" />
            <src path="${host-gen}" />
            <classpath refid="library.libs" />
        </javac>
	</target>
	
	<!-- 混淆 -->
@@ -196,44 +191,51 @@
	<!-- 打包dex文件 -->
	<target name="dex-package">
	    <echo>Packaging dex...</echo>
		<apply executable="${dx}" failonerror="true" parallel="true">
		    <arg value="--dex" />
		    <arg value="--output=${intermediate-dex}" />
		    <arg path="${host-classes}" />
		    <!--<arg path="${host-libs}" />-->
			<!--<fileset dir="${project_home}/${libs-dir}" />-->
		    <!-- Library1 -->
		    <fileset dir="${library_1}/libs" />
		    <!-- Library2 -->
		    <fileset dir="${library_2}/libs" />
		</apply>
        <var name="dex_p" value="--dex --output=${intermediate-dex} ${host-classes} ${host-libs}"/>
        <for list="${libraries}" param="library">
            <sequential>
                <available property="isExist_library_libs" file="@{library}/libs" type="dir" />
                <if>
                    <equals arg1="${isExist_library_libs}" arg2="true" />
                    <then>
                        <var name="dex_p" value="${dex_p} @{library}/libs"/>
                    </then>
                </if>
            </sequential>
        </for>
		<exec executable="${dx}" failonerror="true" >
		    <arg line="${dex_p}"/>
		</exec>
	</target>
	
	<!-- aapt打包资源 -->
	<target name="aapt-package-res">
		<echo>Packaging resources and assets...</echo>
        <var name="temp" value=""/>
        <for list="${libraries}" param="library">
            <sequential>
                <available property="isExist_library_res" file="@{library}/res" type="dir" />
                <if>
                    <equals arg1="${isExist_library_res}" arg2="true" />
                    <then>
                        <var name="temp" value="${temp} -S @{library}/${res-dir}"/>
                    </then>
                </if>
            </sequential>
        </for>
        <var name="res_p" value="package -f -M ${project_home}/${manifest-xml} -S ${project_home}/${res-dir} ${temp} -A ${project_home}/${asset-dir} -I ${android-jar} -F ${resources-package} --auto-add-overlay"/>
		<exec executable="${aapt}" failonerror="true">
		    <arg value="package" />
		    <arg value="-f" />
		    <arg value="-M" />
		    <arg value="${project_home}/${manifest-xml}" />
		    <arg value="-S" />
		    <arg value="${project_home}/${res-dir}" />
		    
			<arg value="-S" />
	        <arg value="${library_1}/${res-dir}" /><!-- 包含Library的资源 -->
	        
		    <!-- <arg value="-S" />
	        <arg value="${library_2}/${res-dir}" /> --><!-- 包含Library2的资源 -->
		    
		    <arg value="-A" />
		    <arg value="${project_home}/${asset-dir}" /><!-- assets文件 -->
		    
		    <arg value="-I" />
		    <arg value="${android-jar}" />
		    <arg value="-F" />
		    <arg value="${resources-package}" /><!-- 输出资源压缩包 -->
		    <arg value="--auto-add-overlay" /> <!-- 这个重要，覆盖资源，不然报错-->
		   <arg line="${res_p}"/>
		</exec>
	</target>
	
@@ -241,33 +243,26 @@
	<!-- APK打包 -->
	<target name="apk-builder">
	    <echo>Building apk...</echo>
        <var name="temp" value=""/>
        <for list="${libraries}" param="library">
            <sequential>
                <available property="isExist_library_libs" file="@{library}/libs" type="dir" />
                <if>
                    <equals arg1="${isExist_library_libs}" arg2="true" />
                    <then>
                        <var name="temp" value="${temp} -nf @{library}/libs -rj @{library}/libs"/>
                    </then>
                </if>
            </sequential>
        </for>
        <var name="apkBuild_p" value="${out-unsigned-package} -u -z ${resources-package} -f ${intermediate-dex} -rf ${host-src} ${temp}"/>
	    <java classpath="${android_apk_tools}/lib/sdklib.jar" classname="com.android.sdklib.build.ApkBuilderMain" fork="true" failonerror="true">
            <sysproperty key="file.encoding" value="UTF-8" />
            <!-- 创建未签名的包 -->
	        <arg value="${out-unsigned-package}" />
	        <arg value="-u" />
            <arg value="-z" />
            <arg value="${resources-package}" />
            <!-- dex中间文件 -->
            <arg value="-f" />
            <arg value="${intermediate-dex}" />
            <!-- Adds the java resources found in that folder -->
            <arg value="-rf" />
            <arg value="${host-src}" />
            <!-- add native libraries -->
            <!--<arg value="-nf" />
            <arg value="${host-libs}" />-->
            <arg value="-nf" />
            <arg value="${library_1}/libs" />
            <arg value="-nf" />
            <arg value="${library_2}/libs" />
            <!-- Adds the java resources found in the jar file(s) -->
            <!--<arg value="-rj" />
            <arg value="${host-libs}" />-->
            <arg value="-rj" />
            <arg value="${library_1}/libs" />
            <arg value="-rj" />
            <arg value="${library_2}/libs" />
            <arg line="${apkBuild_p}"/>
	    </java>
	</target>