Upstream Android LongPressDetector

content/content_shell.gypi

Index: content/content_shell.gypi
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 4e77bf913cafc19f7a3062936c0618372ec5518d..dfafe0df7f4e63eb433d56adfd3353d40f6b1f86 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -558,6 +558,21 @@
           ],
         },
         {
+          'target_name': 'content_javatests',

[Ted C, 2012/07/24 21:01:28]

any reason why this doesn't live within content_tests.gypi?

[Yusuf, 2012/07/24 22:37:56]

I think the reason was to keep this target and the content_shell_test_apk in the
same file. content_test.gypi seems to require defining a few variables in
common.gypi(like chromeos). 

Should I be moving content_javatests and content_shell_test_apk both or include
common.gypi in content_shell.gypi?

On 2012/07/24 21:01:28, Ted C wrote:

[Yaron, 2012/07/24 23:28:22]

I tend to agree that this should be in content_tests.gypi. For that matter,
content_shell_test_apk should also move.

+          'type': 'none',
+          'dependencies': [
+            '../base/base.gyp:base_java',
+            '../base/base.gyp:base_javatests',
+            'content_common',
+            'content_java',
+          ],
+          'variables': {
+            'package_name': 'content_javatests',
+            'java_in_dir': '../content/public/android/javatests',
+          },
+          'includes': [ '../build/java.gypi' ],
+        },
+        {
           'target_name': 'content_shell_apk',
           'type': 'none',
           'actions': [
@@ -638,9 +653,23 @@
           'type': 'none',
           'dependencies': [
             'content_shell_apk',
+            'content_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)'],
+            },
+            {
+              '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',