Adding AndroidProxySelectorTest to ContentShell

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 782 matching lines @@
             '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',
+            '../net/net.gyp:net_javatests',
             '../tools/android/forwarder/forwarder.gyp:forwarder',
           ],
+          'copies': [
+            {
+              'destination': '<(PRODUCT_DIR)/content_shell_test/java/libs',
+              'files': [
+                '<(PRODUCT_DIR)/lib.java/chromium_base_javatests.jar',
+                '<(PRODUCT_DIR)/lib.java/chromium_net_javatests.jar',
+                '<(PRODUCT_DIR)/lib.java/chromium_content_javatests.jar',
+              ],
+            },
+          ],
           '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',
                 '<(DEPTH)/content/shell/android/javatests/AndroidManifest.xml',
                 '<!@(find <(DEPTH)/content/shell/android/javatests/ -name "*.java")'
               ],
               'outputs': [
                 '<(PRODUCT_DIR)/content_shell_test/ContentShellTest-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_TOOLCHAIN=<(android_toolchain)',
                 '-buildfile',
                 '<(DEPTH)/content/shell/android/javatests/content_shell_test_apk.xml',
               ]
             }
           ],
         },
       ],
     }],
   ],
 }