Upstream GestureDetectorProxyTest

content/content_shell.gypi

Index: content/content_shell.gypi
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 4134258b6c6b1412aef03da02e072e09eef03039..fc2c5897d3e17a865b84d517ca28923c6738b548 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -615,13 +615,40 @@
           ],
         },
         {
+          '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_test_apk',
           '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',

[bulach, 2012/07/16 13:22:44]

nit: are these copies necessary? would it be possible to just add these jars to
content_shell_test_apk.xml?

[Ted C, 2012/07/17 00:48:03]

I think it was done this way for historical reasons.  There might be ways to
specify it in the xml, but I'm not aware of any ant files where we do that.  It
is nice only having to change the gyp file if new dependencies are required, but
all the copy declarations are quite annoying.

I think the native test apk generator allows you to specify the java lib paths,
which might be a nice way to keep it all in the gyp file but avoid this cruft.

Again...no strong reason to keep it this way though.

+              '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',