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

Unified Diff: content/content_shell.gypi

Issue 10377059: Android content shell bringup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix deps so builds on clean machine Created 8 years, 7 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
« no previous file with comments | « content/content_jni.gypi ('k') | content/plugin/webplugin_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_shell.gypi
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index a33508b2997a44ec35a814d7cc37bf810ad205ae..4a67c23a1e8b802d195e4f715033a1d240bd4112 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -523,13 +523,25 @@
'actions': [
{
'action_name': 'copy_base_jar',
- 'inputs': ['<(PRODUCT_DIR)/chromium_base.jar'],
+ 'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_base.jar'],
'outputs': ['<(PRODUCT_DIR)/content_shell/java/libs/chromium_base.jar'],
'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
},
{
+ 'action_name': 'copy_net_jar',
+ 'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_net.jar'],
+ 'outputs': ['<(PRODUCT_DIR)/content_shell/java/libs/chromium_net.jar'],
+ 'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
+ },
+ {
+ 'action_name': 'copy_media_jar',
+ 'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_media.jar'],
+ 'outputs': ['<(PRODUCT_DIR)/content_shell/java/libs/chromium_media.jar'],
+ 'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
+ },
+ {
'action_name': 'copy_content_jar',
- 'inputs': ['<(PRODUCT_DIR)/chromium_content.jar'],
+ 'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_content.jar'],
'outputs': ['<(PRODUCT_DIR)/content_shell/java/libs/chromium_content.jar'],
'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
},
@@ -553,6 +565,8 @@
'<!@(find shell/android/java -name "*.java")',
'<!@(find shell/android/res -name "*")',
'<(PRODUCT_DIR)/content_shell/java/libs/chromium_base.jar',
+ '<(PRODUCT_DIR)/content_shell/java/libs/chromium_net.jar',
+ '<(PRODUCT_DIR)/content_shell/java/libs/chromium_media.jar',
'<(PRODUCT_DIR)/content_shell/java/libs/chromium_content.jar',
'<(PRODUCT_DIR)/content_shell/libs/armeabi/libcontent_shell_content_view.so',
],
« no previous file with comments | « content/content_jni.gypi ('k') | content/plugin/webplugin_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698