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

Unified Diff: content/shell/android/javatests/content_shell_test_apk.xml

Issue 10700167: Adds ContentShellTest.apk and very simple test. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 5 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
Index: content/shell/android/javatests/content_shell_test_apk.xml
diff --git a/content/shell/android/java/content_shell_apk.xml b/content/shell/android/javatests/content_shell_test_apk.xml
similarity index 87%
copy from content/shell/android/java/content_shell_apk.xml
copy to content/shell/android/javatests/content_shell_test_apk.xml
index cbdeaccfeafb5d94e4a1e0cd1293ec6db9608251..497a81c9b6a0d13ba9a018f0bc496a1a711e0935 100644
--- a/content/shell/android/java/content_shell_apk.xml
+++ b/content/shell/android/javatests/content_shell_test_apk.xml
@@ -4,10 +4,10 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
-<project name="ContentShell" default="debug" basedir=".">
+<project name="ContentShellTest" default="debug" basedir=".">
<description>
- Building ContentShell.apk
+ Building ContentShellTest.apk
</description>
<property environment="env"/>
@@ -16,7 +16,7 @@
<property name="source.dir" location="src"/>
<property name="target" value="android-${env.ANDROID_SDK_VERSION}"/>
<property name="target.abi" value="${APP_ABI}"/>
- <property name="out.dir" location="${PRODUCT_DIR}/content_shell"/>
+ <property name="out.dir" location="${PRODUCT_DIR}/content_shell_test"/>
<property name="resource.absolute.dir" value="../res"/>
<property name="gen.absolute.dir" value="${out.dir}/gen"/>
<path id="native.libs.gdbserver">
@@ -26,10 +26,8 @@
<property name="asset.absolute.dir" location="${out.dir}/assets" />
<path id="out.dex.jar.input.ref">
- <fileset file="${out.dir}/java/libs/chromium_content.jar"/>
- <fileset file="${out.dir}/java/libs/chromium_net.jar"/>
- <fileset file="${out.dir}/java/libs/chromium_base.jar"/>
- <fileset file="${out.dir}/java/libs/chromium_media.jar"/>
+ <fileset dir="${PRODUCT_DIR}/content_shell/java/libs"/>
+ <pathelement location="${PRODUCT_DIR}/content_shell/classes"/>
</path>
<property name="java.compilerargs" value="-classpath ${toString:out.dex.jar.input.ref}"/>

Powered by Google App Engine
This is Rietveld 408576698