| Index: net/android/java/net.xml
 | 
| diff --git a/net/android/java/net.xml b/net/android/java/net.xml
 | 
| index a627612e8e55d5ce7f47f6ad11938e5956fa4520..4b059e8df11b189a67f2fe03bd046359e7427bc8 100644
 | 
| --- a/net/android/java/net.xml
 | 
| +++ b/net/android/java/net.xml
 | 
| @@ -1,59 +1,16 @@
 | 
| +<!--
 | 
| +  Copyright (c) 2012 The Chromium Authors. All rights reserved.
 | 
| +  Use of this source code is governed by a BSD-style license that can be
 | 
| +  found in the LICENSE file.
 | 
| +-->
 | 
|  <project name="net" default="dist" basedir=".">
 | 
|    <description>
 | 
|      Building net/ java source code with ant.
 | 
|    </description>
 | 
| -  <!-- Set global properties for this build -->
 | 
| -  <property environment="env"/>
 | 
| -  <property name="sdk.dir" location="${env.ANDROID_SDK_ROOT}"/>
 | 
| -  <!-- TODO(jrg): The apk-runner's version is hardcoded to SDK version 14. These
 | 
| -    two should be unified. -->
 | 
| -  <property name="sdk.version" value="${env.ANDROID_SDK_VERSION}"/>
 | 
| -  <property name="src" location="src"/>
 | 
| -  <property name="dist" location="dist"/>
 | 
| -  <property name="out.dir" location="${PRODUCT_DIR}/lib.java"/>
 | 
| -  <!-- TODO(jrg): establish a standard for the intermediate java
 | 
| -           directories.  Settle on a standard once ant/jar build files
 | 
| -           like this are androidified -->
 | 
| -  <property name="dest.dir" location="${PRODUCT_DIR}/java/net"/>
 | 
| +  <import file="../../../build/android/ant/chromium-jars.xml"/>
 | 
|  
 | 
| -  <!-- Set path depending on the type of repository. If ANDROID_BUILD_TOP is
 | 
| -    set then build using the provided location. Otherwise, assume the build
 | 
| -    is using the released SDK and set the path accordingly. -->
 | 
| -  <condition property="location.base"
 | 
| -             value="${sdk.dir}"
 | 
| -             else="${sdk.dir}/platforms/android-${sdk.version}">
 | 
| -    <isset property="env.ANDROID_BUILD_TOP"/>
 | 
| -  </condition>
 | 
| -
 | 
| -  <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 " >
 | 
| -    <javac srcdir="${src}" destdir="${dest.dir}" debug="true" includeantruntime="false">
 | 
| -      <classpath>
 | 
| -        <path location="${location.base}/android.jar"/>
 | 
| -        <path location="${out.dir}/chromium_base.jar"/>
 | 
| -      </classpath>
 | 
| -    </javac>
 | 
| -  </target>
 | 
| -
 | 
| -  <target name="dist" depends="compile"
 | 
| -          description="generate the distribution" >
 | 
| -    <!-- Create the distribution directory -->
 | 
| -    <mkdir dir="${dist}/lib"/>
 | 
| -
 | 
| -    <jar jarfile="${out.dir}/chromium_net.jar" basedir="${dest.dir}"/>
 | 
| -  </target>
 | 
| -
 | 
| -  <target name="clean"
 | 
| -          description="clean up" >
 | 
| -    <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>
 | 
| 
 |