diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-06 23:23:51 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-06 23:23:51 +0000 |
| commit | 300800480f12dc97c8e9d90dd101fabd29203115 (patch) | |
| tree | 21cfcb39e090675b55c3c512da10ee721bd11817 /net | |
| parent | 4f3db5b5a785511a73282af279d3f30c975944a9 (diff) | |
| download | chromium_src-300800480f12dc97c8e9d90dd101fabd29203115.zip chromium_src-300800480f12dc97c8e9d90dd101fabd29203115.tar.gz chromium_src-300800480f12dc97c8e9d90dd101fabd29203115.tar.bz2 | |
[Android] Add chrome_java target for building Java code in the chromium layer.
Also includes a refactoring of the Ant xml scripts to use a common template (contributed by shashishekhar@chromium.org). As part of this, I also continued Torne's effort of removing our reliance on environment variables. Unfortunately this currently means that you have to specify 5 gyp flags:
ANDROID_SDK, ANDROID_SDK_ROOT, ANDROID_SDK_TOOLS, ANDROID_SDK_VERSION, ANDROID_TOOLCHAIN.
This'll get better as we make further use of the checked in sdk both upstream and downstream. The problem stems from the android tree and released sdk having different configurations.
Review URL: https://chromiumcodereview.appspot.com/10830012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150172 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/android/java/net.xml | 49 |
1 files changed, 10 insertions, 39 deletions
diff --git a/net/android/java/net.xml b/net/android/java/net.xml index 22d3871..521f245 100644 --- a/net/android/java/net.xml +++ b/net/android/java/net.xml @@ -1,45 +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 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"/> - <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="${ANDROID_SDK}/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="${ANDROID_SDK}/android.jar"/> + <pathelement location="${lib.dir}/chromium_base.jar"/> + </path> </project> |