diff options
| author | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-13 20:17:24 +0000 |
|---|---|---|
| committer | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-13 20:17:24 +0000 |
| commit | 1d1ebf4802b8b425659d7a853e8a8453adce0c05 (patch) | |
| tree | 5a471f95fcbc8b06dc4caa2bd1609de5422d43dc /base/android | |
| parent | d6fb791f82043564d3e617a21fb8b92dcd70197d (diff) | |
| download | chromium_src-1d1ebf4802b8b425659d7a853e8a8453adce0c05.zip chromium_src-1d1ebf4802b8b425659d7a853e8a8453adce0c05.tar.gz chromium_src-1d1ebf4802b8b425659d7a853e8a8453adce0c05.tar.bz2 | |
Make jars build from a single ant .xml template
The ant build files for each of the jars that we create consisted of
only fairly straightforward boilerplate. With the recent changes to
java.gypi and java_aidl.gypi we can now build these correctly from a
single .xml with GYP passing in defines for the minor differences.
BUG=136756
Review URL: https://chromiumcodereview.appspot.com/10831227
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151334 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/android')
| -rw-r--r-- | base/android/java/base.xml | 15 | ||||
| -rw-r--r-- | base/android/javatests/base_javatests.xml | 52 |
2 files changed, 0 insertions, 67 deletions
diff --git a/base/android/java/base.xml b/base/android/java/base.xml deleted file mode 100644 index e315875..0000000 --- a/base/android/java/base.xml +++ /dev/null @@ -1,15 +0,0 @@ -<!-- - 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="Base" default="dist" basedir="."> - <description> - building base java source code with ant - </description> - <import file="../../../build/android/ant/chromium-jars.xml" /> - - <path id="javac.custom.classpath"> - <pathelement location="${ANDROID_SDK}/android.jar" /> - </path> -</project> diff --git a/base/android/javatests/base_javatests.xml b/base/android/javatests/base_javatests.xml deleted file mode 100644 index ba16358..0000000 --- a/base/android/javatests/base_javatests.xml +++ /dev/null @@ -1,52 +0,0 @@ -<project name="BaseJavaTests" default="dist" basedir="."> - <description> - building base java tests source code with ant - </description> - <!-- Set global properties for this build --> - <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/base_javatests"/> - - <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 ${build} --> - <!-- TODO(jrg): adapting this to a proper android antfile will - remove warnings like this: - base.xml:23: warning: 'includeantruntime' was not set, - defaulting to build.sysclasspath=last; - set to false for repeatable builds - --> - <javac srcdir="${src}" destdir="${dest.dir}" debug="true" includeantruntime="false"> - <classpath> - <path location="${ANDROID_SDK}/android.jar"/> - </classpath> - </javac> - </target> - - <target name="dist" depends="compile" - description="generate the distribution" > - <!-- Create the distribution directory --> - <mkdir dir="${out.dir}"/> - - <jar jarfile="${out.dir}/chromium_base_javatests.jar" basedir="${dest.dir}"/> - </target> - - <target name="clean" - description="clean up" > - <!-- Delete the appropriate directory trees --> - <delete dir="${dest.dir}"/> - <delete dir="${dist}"/> - </target> -</project> |