Add test jar generation logic for ant builds.

content/content_tests.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.
 
 {
   'targets': [
     {
       'target_name': 'test_support_content',
       'type': 'static_library',
       'defines!': ['CONTENT_IMPLEMENTATION'],
@@ skipping 429 matching lines @@
         '../webkit/media/buffered_resource_loader_unittest.cc',
         '../webkit/media/cache_util_unittest.cc',
         '../webkit/media/crypto/proxy_decryptor_unittest.cc',
         '../webkit/media/skcanvas_video_renderer_unittest.cc',
         '../webkit/media/test_response_generator.cc',
         '../webkit/media/test_response_generator.h',
         '../webkit/mocks/mock_weburlloader.cc',
         '../webkit/mocks/mock_weburlloader.h',
         '../webkit/plugins/npapi/plugin_lib_unittest.cc',
         '../webkit/plugins/npapi/plugin_list_unittest.cc',
-        '../webkit/plugins/npapi/plugin_utils_unittest.cc',        
+        '../webkit/plugins/npapi/plugin_utils_unittest.cc',
         '../webkit/plugins/npapi/webplugin_impl_unittest.cc',
         '../webkit/quota/mock_quota_manager.cc',
         '../webkit/quota/mock_quota_manager.h',
         '../webkit/quota/mock_quota_manager_unittest.cc',
         '../webkit/quota/mock_storage_client.cc',
         '../webkit/quota/mock_storage_client.h',
         '../webkit/quota/quota_database_unittest.cc',
         '../webkit/quota/quota_manager_unittest.cc',
         '../webkit/quota/quota_temporary_storage_evictor_unittest.cc',
       ],
@@ skipping 37 matching lines @@
             '../webkit/webkit.gyp:test_shell_test_support',
           ],
         }],
         ['enable_webrtc==1', {
           'sources': [
             'browser/renderer_host/p2p/socket_host_test_utils.h',
             'browser/renderer_host/p2p/socket_host_tcp_unittest.cc',
             'browser/renderer_host/p2p/socket_host_tcp_server_unittest.cc',
             'browser/renderer_host/p2p/socket_host_udp_unittest.cc',
             'renderer/media/media_stream_dependency_factory_unittest.cc',
-            'renderer/media/media_stream_dispatcher_unittest.cc',            
+            'renderer/media/media_stream_dispatcher_unittest.cc',
             'renderer/media/media_stream_impl_unittest.cc',
             'renderer/media/peer_connection_handler_jsep_unittest.cc',
             'renderer/media/rtc_peer_connection_handler_unittest.cc',
             'renderer/media/rtc_video_decoder_unittest.cc',
             'renderer/media/webrtc_audio_device_unittest.cc',
           ],
           'dependencies': [
             '../third_party/libjingle/libjingle.gyp:libjingle_peerconnection',
             '../third_party/webrtc/modules/modules.gyp:video_capture_module',
             '../third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
@@ skipping 350 matching lines @@
           },
           'includes': [ '../build/java.gypi' ],
         },
         {
           'target_name': 'content_shell_test_apk',
           'type': 'none',
           'dependencies': [
             'content_java',
             'content_javatests',
             'content_shell_apk',
-            '../base/base.gyp:base_java',
             '../base/base.gyp:base_java_test_support',
-            '../media/media.gyp:media_java',
-            '../media/media.gyp:media_test_support',
-            '../net/net.gyp:net_java',
             '../net/net.gyp:net_javatests',
             '../tools/android/forwarder/forwarder.gyp:forwarder',
           ],
           'actions': [
             {
               'action_name': 'content_shell_test_generate_apk',
               'inputs': [
                 '../build/android/ant/common.xml',
                 '../build/android/ant/sdk-targets.xml',
                 '<(DEPTH)/content/shell/android/javatests/content_shell_test_apk.xml',
                 '<(DEPTH)/content/shell/android/javatests/AndroidManifest.xml',
                 '>@(input_jars_paths)',
-                '<!@(find <(DEPTH)/content/shell/android/javatests/ -name "*.java")'
+                '<!@(find <(DEPTH)/content/shell/android/javatests/ -name "*.java")',
               ],
               'outputs': [
-                '<(PRODUCT_DIR)/content_shell_test/ContentShellTest-debug.apk',
+                '<(PRODUCT_DIR)/apks/ContentShellTest-debug.apk',
+                '<(PRODUCT_DIR)/test.lib.java/ContentShellTest-debug.jar',
               ],
               '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)',
                 '-DINPUT_JARS_PATHS=>(input_jars_paths)',
+                '-DCHROMIUM_SRC=<(ant_build_out)/../..',
                 '-buildfile',
                 '<(DEPTH)/content/shell/android/javatests/content_shell_test_apk.xml',
               ]
             }
           ],
         },
       ],
     }],
   ],
 }