| Index: media/base/android/java/media.xml
|
| diff --git a/media/base/android/java/media.xml b/media/base/android/java/media.xml
|
| index a62291b9ed3e1637baa98e045a39e39a597da521..00cc435c303c0acc7ecaa381b06563d89d8d5a6b 100644
|
| --- a/media/base/android/java/media.xml
|
| +++ b/media/base/android/java/media.xml
|
| @@ -7,54 +7,11 @@
|
| <description>
|
| building media java source code with ant
|
| </description>
|
| - <!-- set global properties for this build -->
|
| - <property environment="env"/>
|
| - <property name="sdk.dir" location="${env.ANDROID_SDK_ROOT}"/>
|
| - <property name="sdk.version" value="${env.ANDROID_SDK_VERSION}"/>
|
| - <property name="src" location="src"/>
|
| - <property name="build" location="build"/>
|
| - <property name="dist" location="dist"/>
|
| - <property name="out.dir" location="${PRODUCT_DIR}/lib.java"/>
|
| - <property name="dest.dir" location="${PRODUCT_DIR}/java/media"/>
|
|
|
| - <condition property="location.base"
|
| - value="${sdk.dir}"
|
| - else="${sdk.dir}/platforms/android-${sdk.version}">
|
| - <isset property="env.ANDROID_BUILD_TOP"/>
|
| - </condition>
|
| + <import file="../../../../build/android/ant/chromium-jars.xml" />
|
|
|
| - <target name="init">
|
| - <!-- Create the time stamp -->
|
| - <tstamp/>
|
| - <!-- Create the build directory structure used by compile -->
|
| - <mkdir dir="${out.dir}"/>
|
| - <mkdir dir="${dest.dir}"/>
|
| - </target>
|
| -
|
| - <target name="compile" depends="init"
|
| - description="compile the source " >
|
| - <!-- Compile the java code from ${src} into ${dest.dir} -->
|
| - <javac srcdir="${src}" destdir="${dest.dir}" debug="true" includeantruntime="false">
|
| - <classpath>
|
| - <pathelement path="${location.base}/android.jar" />
|
| - <pathelement path="${out.dir}/chromium_base.jar" />
|
| - </classpath>
|
| - </javac>
|
| - </target>
|
| -
|
| - <target name="dist" depends="compile"
|
| - description="generate the distribution" >
|
| - <!-- Create the distribution directory -->
|
| - <mkdir dir="${out.dir}"/>
|
| -
|
| - <!-- Put everything in ${build} into the chromium_media.jar file -->
|
| - <jar jarfile="${out.dir}/chromium_media.jar" basedir="${dest.dir}"/>
|
| - </target>
|
| -
|
| - <target name="clean"
|
| - description="clean up" >
|
| - <!-- Delete the appropriate directory trees -->
|
| - <delete dir="${dest.dir}"/>
|
| - <delete dir="${dist}"/>
|
| - </target>
|
| + <path id="javac.custom.classpath">
|
| + <pathelement location="${location.base}/android.jar" />
|
| + <pathelement location="${lib.dir}/chromium_base.jar" />
|
| + </path>
|
| </project>
|
|
|