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 /content/content.gyp | |
| 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 'content/content.gyp')
| -rw-r--r-- | content/content.gyp | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/content/content.gyp b/content/content.gyp index b05a6e7..ce006f1 100644 --- a/content/content.gyp +++ b/content/content.gyp @@ -200,30 +200,20 @@ ['OS == "android"', { 'targets': [ { - 'target_name': 'content_jni_headers', - 'type': 'none', - 'variables': { - 'java_sources': [ - '../content/public/android/java/org/chromium/content/browser/LocationProvider.java', - ], - 'jni_headers': [ - '<(SHARED_INTERMEDIATE_DIR)/content/jni/location_provider_jni.h', - ], - }, - 'includes': [ '../build/jni_generator.gypi' ], - }, - { 'target_name': 'content_java', 'type': 'none', + 'dependencies': ['../base/base.gyp:base_java'], 'variables': { 'package_name': 'content', 'java_in_dir': '../content/public/android/java', }, - 'dependencies': [ - '../base/base.gyp:base_java', - ], 'includes': [ '../build/java.gypi' ], }, + { + 'target_name': 'content_jni_headers', + 'type': 'none', + 'includes': [ 'content_jni.gypi' ], + }, ], }], # OS == "android" ], |