diff options
| author | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-27 23:22:57 +0000 |
|---|---|---|
| committer | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-27 23:22:57 +0000 |
| commit | 8a6702b4c40143058d6750e198641a7e172db611 (patch) | |
| tree | b0dd5fdba76a4be35ac2bfadb9657fb5babb4220 /content/shell | |
| parent | b97c3165accb064ee91dd494327163f8d1aa7ee5 (diff) | |
| download | chromium_src-8a6702b4c40143058d6750e198641a7e172db611.zip chromium_src-8a6702b4c40143058d6750e198641a7e172db611.tar.gz chromium_src-8a6702b4c40143058d6750e198641a7e172db611.tar.bz2 | |
Make some apk targets not refer directly to output .class files from other targets
This requires making chromium_testshell create a .jar like content_shell
currently is.
Then, chromium_testshell_test and content_shell_test can just depend on
the new _java targets for the apk that they instrument and get the .jar
in their classpath.
See: http://crrev.com/10969020 for the similar gyp change to content_shell.
BUG=146568
Review URL: https://chromiumcodereview.appspot.com/10978033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159149 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell')
| -rw-r--r-- | content/shell/android/javatests/content_shell_test_apk.xml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/content/shell/android/javatests/content_shell_test_apk.xml b/content/shell/android/javatests/content_shell_test_apk.xml index 7085b0a..d018aa2 100644 --- a/content/shell/android/javatests/content_shell_test_apk.xml +++ b/content/shell/android/javatests/content_shell_test_apk.xml @@ -27,16 +27,12 @@ check-exists="false"/> <property name="generate.test.jar" value="true"/> - <property-location name="contentshell.classes.dir" - location="${PRODUCT_DIR}/content_shell/classes"/> - <path id="javac.custom.sourcepath"> <pathelement location="../../../public/android/javatests/src"/> </path> <path id="out.dex.jar.input.ref"> <filelist files="${INPUT_JARS_PATHS}"/> - <pathelement location="${contentshell.classes.dir}"/> </path> <!-- Classpath for javac --> |