Add support for the ChromiumTestShellTest APK.

chrome/chrome_android.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     'chrome_android_paks.gypi', # Included for the list of pak resources.
   ],
@@ skipping 21 matching lines @@
               'dependencies': [ '../tools/cygprofile/cygprofile.gyp:cygprofile', ],
             }],
           ],
         }],
       ],
     },
     {
       'target_name': 'chromium_testshell',
       'type': 'none',
       'dependencies': [
+        '../base/base.gyp:base_java',
+        '../content/content.gyp:content_java',
+        '../media/media.gyp:media_java',
+        '../net/net.gyp:net_java',
+        #'browser/component/components.gyp:web_contents_delegate_android_java'

[Ted C, 2012/09/19 21:18:49]

remove?

[David Trainor- moved to gerrit, 2012/09/20 02:28:17]

Done.

+        'chrome.gyp:chrome_java',
         'chrome_android_paks',
         'libchromiumtestshell',
       ],
       'actions': [
         {
           'action_name': 'copy_and_strip_so',
           'inputs': ['<(SHARED_LIB_DIR)/libchromiumtestshell.so'],
           'outputs': ['<(PRODUCT_DIR)/chromium_testshell/libs/<(android_app_abi)/libchromiumtestshell.so'],
           'action': [
             '<(android_strip)',
             '--strip-unneeded',
             '<@(_inputs)',
             '-o',
             '<@(_outputs)',
           ],
         },
         {
           'action_name': 'chromium_testshell_generate_apk',
           'inputs': [
             '<@(chrome_android_pak_output_resources)',
-            '<!@(find android/testshell/java/src -name "*.java")',
             # TODO(dtrainor): Uncomment these once resources are added.
             #'<!@(find android/testshell/java/res -name "*.png")',
             #'<!@(find android/testshell/java/res -name "*.xml")',
-            '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
-            '<(PRODUCT_DIR)/lib.java/chromium_net.jar',
-            '<(PRODUCT_DIR)/lib.java/chromium_media.jar',
-            '<(PRODUCT_DIR)/lib.java/chromium_content.jar',
-            '<(PRODUCT_DIR)/lib.java/chromium_chrome.jar',
-            '<(PRODUCT_DIR)/lib.java/chromium_web_contents_delegate_android.jar',
+            # Right now comment out the find call, relying on the jar version instead.

[Ted C, 2012/09/19 21:18:49]

huh?  what does this mean?  Should this be a TODO as well?

[David Trainor- moved to gerrit, 2012/09/20 02:28:17]

Sorry, remnants of my fight with gyp and ant.

On 2012/09/19 21:18:49, Ted C wrote:

+            '<!@(find android/testshell/java/src -name "*.java")',
+            '>@(input_jars_paths)',
             '<(PRODUCT_DIR)/chromium_testshell/libs/<(android_app_abi)/libchromiumtestshell.so'
           ],
           'outputs': [
             '<(PRODUCT_DIR)/chromium_testshell/ChromiumTestShell-debug.apk',
           ],
           'action': [
             'ant',
             '-DPRODUCT_DIR=<(ant_build_out)',
             '-DAPP_ABI=<(android_app_abi)',
             '-DANDROID_SDK=<(android_sdk)',
             '-DANDROID_SDK_ROOT=<(android_sdk_root)',
             '-DANDROID_SDK_TOOLS=<(android_sdk_tools)',
             '-DANDROID_SDK_VERSION=<(android_sdk_version)',
             '-DANDROID_GDBSERVER=<(android_gdbserver)',
             '-DCONFIGURATION_NAME=<(CONFIGURATION_NAME)',
+            '-DINPUT_JARS_PATHS=>(input_jars_paths)',
             '-buildfile',
             '<(DEPTH)/chrome/android/testshell/java/chromium_testshell_apk.xml',
           ],
         },
       ],
     },
     {
       'target_name': 'chrome_android_core',
       'type': 'static_library',
       'dependencies': [
@@ skipping 34 matching lines @@
       'copies': [
         {
           'destination': '<(chrome_android_pak_output_folder)',
           'files': [ '<@(chrome_android_pak_input_resources)' ],
         }
       ],
     },
   ],
 }