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

Unified Diff: content/content_tests.gypi

Issue 10830287: Adding AndroidProxySelectorTest to ContentShell (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixing piman's nit Created 8 years, 4 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 | « no previous file | content/shell/android/javatests/content_shell_test_apk.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 8a2367c8db9b8a584fd494c2ab29ade29371f6e9..9bfdc4a1fefc1b0adae6a584f5b9d36a0c477457 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -800,21 +800,20 @@
'dependencies': [
'content_shell_apk',
'content_javatests',
+ '../net/net.gyp:net_javatests',
'../tools/android/forwarder/forwarder.gyp:forwarder',
],
- '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)'],
- },
+ 'copies': [
{
- '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)'],
+ 'destination': '<(PRODUCT_DIR)/content_shell_test/java/libs',
+ 'files': [
+ '<(PRODUCT_DIR)/lib.java/chromium_base_javatests.jar',
+ '<(PRODUCT_DIR)/lib.java/chromium_net_javatests.jar',
+ '<(PRODUCT_DIR)/lib.java/chromium_content_javatests.jar',
+ ],
},
+ ],
+ 'actions': [
{
'action_name': 'content_shell_test_generate_apk',
'inputs': [
« no previous file with comments | « no previous file | content/shell/android/javatests/content_shell_test_apk.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698