Ant打包修复

display-client/build/build.xml

@@ -68,10 +68,10 @@
			-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_r" file="@{library}/res" type="dir" />
    			<if>
    			    <equals arg1="${isExist_library_res}" arg2="true" />
    			    <equals arg1="${isExist_library_res_r}" arg2="true" />
    			    <then>
                        <var name="p" value="${p} -S @{library}/${res-dir}"/>
    			    </then>
@@ -88,10 +88,10 @@
	
	<target name="aapt_gererateR_library">
		<echo>gererate R.java with ${library}</echo>
		<available property="isExist_library_res" file="${library}/res" type="dir" />
		<available property="isExist_library_r_l" file="${library}/res" type="dir" />
		<!-- 是否需要参数 -S ${library}/${res-dir} -->
		<if>
		    <equals arg1="${isExist_library_res}" arg2="true" />
		    <equals arg1="${isExist_library_r_l}" arg2="true" />
		    <then>
		    	<var name="param" value="-S ${library}/${res-dir}"/>
		    </then>
@@ -127,10 +127,10 @@
	<!-- 编译java文件为class文件 -->
	<target name="compile">
        <available property="isExist_host_libs" file="${host-libs}" type="dir" />
        <available property="isExist_host_libs_h" file="${host-libs}" type="dir" />
        <if>
            <equals arg1="${isExist_host_libs}" arg2="true" />
            <equals arg1="${isExist_host_libs_h}" arg2="true" />
            <then>
                <copydir src="${host-libs}"
                 dest="${host-bin}/libs"/>
@@ -138,10 +138,10 @@
        </if>
        <for list="${libraries}" param="library">
            <sequential>
                <available property="isExist_library_libs" file="@{library}/libs" type="dir" />
                <available property="isExist_library_libs_l" file="@{library}/libs" type="dir" />
                <if>
                    <equals arg1="${isExist_library_libs}" arg2="true" />
                    <equals arg1="${isExist_library_libs_l}" arg2="true" />
                    <then>
                        <copydir src="@{library}/libs"
                                 dest="${host-bin}/libs"
@@ -200,10 +200,10 @@
	    <echo>Packaging dex...</echo>
        <var name="dex_p" value="--dex --output=${intermediate-dex} ${host-classes}"/>
        <available property="isExist_host_libs" file="${host-libs}" type="dir" />
        <available property="isExist_host_libs_dx" file="${host-libs}" type="dir" />
        <if>
            <equals arg1="${isExist_host_libs}" arg2="true" />
            <equals arg1="${isExist_host_libs_dx}" arg2="true" />
            <then>
                <var name="dex_p" value="${dex_p} ${host-libs}"/>
            </then>
@@ -211,10 +211,10 @@
        <for list="${libraries}" param="library">
            <sequential>
                <available property="isExist_library_libs" file="@{library}/libs" type="dir" />
                <available property="isExist_host_libs_dx_l" file="@{library}/libs" type="dir" />
                <if>
                    <equals arg1="${isExist_library_libs}" arg2="true" />
                    <equals arg1="${isExist_host_libs_dx_l}" arg2="true" />
                    <then>
                        <var name="dex_p" value="${dex_p} @{library}/libs"/>
                    </then>
@@ -236,10 +236,10 @@
        <var name="temp" value=""/>
        <for list="${libraries}" param="library">
            <sequential>
                <available property="isExist_library_res" file="@{library}/res" type="dir" />
                <available property="isExist_library_res_aapt" file="@{library}/res" type="dir" />
                <if>
                    <equals arg1="${isExist_library_res}" arg2="true" />
                    <equals arg1="${isExist_library_res_aapt}" arg2="true" />
                    <then>
                        <var name="temp" value="${temp} -S @{library}/${res-dir}"/>
                    </then>
@@ -248,6 +248,9 @@
            </sequential>
        </for>
        <echo>------------------------------</echo>
        <echo>${temp}</echo>
        <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">
@@ -263,17 +266,16 @@
        <var name="temp" value=""/>
        <for list="${libraries}" param="library">
            <sequential>
                <available property="isExist_library_libs" file="@{library}/libs" type="dir" />
                <available property="isExist_library_libs_builder" file="@{library}/libs" type="dir" />
                <if>
                    <equals arg1="${isExist_library_libs}" arg2="true" />
                    <equals arg1="${isExist_library_libs_builder}" 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">