Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(558)

Unified Diff: content/public/android/java/content.xml

Issue 10209003: Upstream Android Geolocation (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Address Yaron's concerns. Still need to resolve Java locations. Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/content_tests.gypi ('k') | content/public/android/java/content_public.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/android/java/content.xml
diff --git a/content/public/android/java/content.xml b/content/public/android/java/content.xml
deleted file mode 100644
index a00a4e564565e80ca852db7c4e466caa8f56acdd..0000000000000000000000000000000000000000
--- a/content/public/android/java/content.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<!-- Copyright (c) 2012 The Chromium Authors. All rights reserved.
John Knottenbelt 2012/04/26 15:35:34 I renamed this to content_public, so that we don't
-
- Use of this source code is governed by a BSD-style license that can be
- found in the LICENSE file.
--->
-<project name="Content" default="dist" basedir=".">
- <description>
- building content 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="."/>
- <property name="out.dir" location="${PRODUCT_DIR}"/>
- <property name="classes.dir" location="${out.dir}/java/${PACKAGE_NAME}"/>
- <!-- TODO(tedchoc): Move out of the main out/ dir ... needs to sync with
- java.gypi output -->
- <property name="jar.dir" location="${out.dir}"/>
-
- <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}"/>
- </target>
-
- <target name="compile" depends="init"
- description="compile the source " >
- <!-- Create the classes output directory -->
- <mkdir dir="${classes.dir}"/>
-
- <!-- Compile the java code from ${src} into ${classes.dir} -->
- <javac srcdir="${src}" destdir="${classes.dir}">
- <classpath>
- <path location="${location.base}/android.jar"/>
- </classpath>
- </javac>
- </target>
-
- <target name="dist" depends="compile"
- description="generate the distribution" >
- <!-- Create the distribution directory -->
- <mkdir dir="${jar.dir}"/>
-
- <!-- Put everything in ${classes.dir} into the chromium_content.jar file -->
- <jar jarfile="${jar.dir}/chromium_${PACKAGE_NAME}.jar" basedir="${classes.dir}"/>
- </target>
-
- <target name="clean" description="clean up" >
- <!-- Delete the generated content -->
- <delete dir="${classes.dir}"/>
- <delete file="${jar.dir}/chromium_${PACKAGE_NAME}.jar"/>
- </target>
-</project>
« no previous file with comments | « content/content_tests.gypi ('k') | content/public/android/java/content_public.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698