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

Unified Diff: content/content_shell.gypi

Issue 10802036: Not to be submitted yet. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 5 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 | « base/base.gyp ('k') | content/public/android/java/src/org/chromium/content/browser/LongPressDetector.java » ('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 213b32ef5642b5085396a284e837fcc2c42ca78d..52f07d9fe081ee04567671104bbfdc0f1eaecd16 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -546,6 +546,20 @@
],
},
{
+ 'target_name': 'content_javatests',
+ 'type': 'none',
+ 'dependencies': [
+ '../base/base.gyp:base_java',
+ '../base/base.gyp:base_javatests',
+ 'content_common',
+ ],
+ 'variables': {
+ 'package_name': 'content_javatests',
+ 'java_in_dir': '../content/public/android/javatests',
+ },
+ 'includes': [ '../build/java.gypi' ],
+ },
+ {
'target_name': 'content_shell_apk',
'type': 'none',
'actions': [
@@ -626,9 +640,22 @@
'type': 'none',
'dependencies': [
'content_shell_apk',
+ 'content_javatests',
],
'actions': [
{
+ 'action_name': 'copy_base_javatests_jar',
+ 'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_base_javatests.jar'],
+ 'outputs': ['<(PRODUCT_DIR)/content_shell_test/java/libs/chromium_base_javatests.jar'],
+ 'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
+ },
+ {
+ 'action_name': 'copy_content_javatests_jar',
+ 'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_content_javatests.jar'],
+ 'outputs': ['<(PRODUCT_DIR)/content_shell_test/java/libs/chromium_content_javatests.jar'],
+ 'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
+ },
+ {
'action_name': 'content_shell_test_generate_apk',
'inputs': [
'<(DEPTH)/content/shell/android/javatests/content_shell_test_apk.xml',
« no previous file with comments | « base/base.gyp ('k') | content/public/android/java/src/org/chromium/content/browser/LongPressDetector.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698