diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 01:50:47 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 01:50:47 +0000 |
| commit | e08255671738c597992f5067bc52eccf75f1afa1 (patch) | |
| tree | 53e9a332ca7a1b619dfce059a131361746339414 /net | |
| parent | 6465bc3aea8a62f0598d5ea16e5efe8272f24dbf (diff) | |
| download | chromium_src-e08255671738c597992f5067bc52eccf75f1afa1.zip chromium_src-e08255671738c597992f5067bc52eccf75f1afa1.tar.gz chromium_src-e08255671738c597992f5067bc52eccf75f1afa1.tar.bz2 | |
Android content shell bringup.
Build media java files (we weren't).
Fix adb_install_content_shell for cases where the app was stuck.
Add upstream staging gyp var / #define.
Be more consistent about jar output files (all in lib.java).
Upstream a bunch of random files (e.g. ppapi).
Upstream a bunch of java and native code hit as part of shlib init.
Properly package jar files in content shell.
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10377059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136219 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/android/java/net.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/android/java/net.xml b/net/android/java/net.xml index 76dddcc..29c9b02 100644 --- a/net/android/java/net.xml +++ b/net/android/java/net.xml @@ -38,7 +38,7 @@ <javac srcdir="${src}" destdir="${dest.dir}"> <classpath> <path location="${location.base}/android.jar"/> - <path location="${PRODUCT_DIR}/chromium_base.jar"/> + <path location="${out.dir}/chromium_base.jar"/> </classpath> </javac> </target> |