Upstream Android LongPressDetector

content/public/android/javatests/content_javatests.xml

Index: content/public/android/javatests/content_javatests.xml
diff --git a/content/public/android/java/content.xml b/content/public/android/javatests/content_javatests.xml
similarity index 85%
copy from content/public/android/java/content.xml
copy to content/public/android/javatests/content_javatests.xml
index 2302b1fdc99ad95be829c0d5793c6ef43413659f..a46511881cd36a934884d9dc35a7212831c8e67f 100644
--- a/content/public/android/java/content.xml
+++ b/content/public/android/javatests/content_javatests.xml
@@ -3,9 +3,9 @@
      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=".">
+<project name="ContentJavaTests" default="dist" basedir=".">
   <description>
-    building content java source code with ant
+    building content-only instrumentation tests with ant
   </description>
   <!-- set global properties for this build -->
   <property environment="env"/>
@@ -37,11 +37,12 @@
     <!-- Compile the java code from ${src} into ${classes.dir} -->
     <!-- Gyp target should have compiled aidl files into java source files in
          lib.jar (see content.gyp:common_aidl). -->
-    <javac srcdir="${src}:${out.dir}" destdir="${classes.dir}" debug="true" includeantruntime="false">
+    <javac srcdir="${src}" destdir="${classes.dir}" debug="true" includeantruntime="false">
       <classpath>
         <pathelement path="${location.base}/android.jar" />
         <pathelement path="${jar.dir}/chromium_base.jar" />
-        <pathelement path="${jar.dir}/chromium_net.jar" />
+        <pathelement path="${jar.dir}/chromium_base_javatests.jar" />
+        <pathelement path="${jar.dir}/chromium_content.jar" />
       </classpath>
     </javac>
   </target>
@@ -51,7 +52,7 @@
     <!-- Create the distribution directory -->
     <mkdir dir="${jar.dir}"/>
 
-    <!-- Put everything in ${classes.dir} into the chromium_content.jar file -->
+    <!-- Put everything in ${classes.dir} into the chromium_content_tests.jar file -->
     <jar jarfile="${jar.dir}/chromium_${PACKAGE_NAME}.jar" basedir="${classes.dir}"/>
   </target>