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 /build/java.gypi | |
| 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 'build/java.gypi')
| -rw-r--r-- | build/java.gypi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/java.gypi b/build/java.gypi index bb60a8f..c05981d 100644 --- a/build/java.gypi +++ b/build/java.gypi @@ -25,7 +25,7 @@ # base/android/java/org/chromium/base/Bar.java # # Finally, the generated jar-file will be: -# <(PRODUCT_DIR)/chromium_base.jar +# <(PRODUCT_DIR)/lib.java/chromium_base.jar # # TODO(yfriedman): The "finally" statement isn't entirely true yet, as we don't # auto-generate the ant file yet. @@ -40,7 +40,7 @@ '<!@(find <(java_in_dir) -name "*.java")' ], 'outputs': [ - '<(PRODUCT_DIR)/chromium_<(package_name).jar', + '<(PRODUCT_DIR)/lib.java/chromium_<(package_name).jar', ], 'action': [ 'ant', |