Add test jar generation logic for ant builds.

content/content_tests.gypi

Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 772b278f11a0017153cfc84fa0a759146eca558a..2ab6d189fc0395d77b68e5b5c001a7be02f0b4bc 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -447,7 +447,7 @@
         '../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',
@@ -505,7 +505,7 @@
             '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',
@@ -876,11 +876,7 @@
             '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',
           ],
@@ -893,10 +889,11 @@
                 '<(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',
@@ -908,6 +905,7 @@
                 '-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',
               ]