Revert 179189

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 800 matching lines @@
               'sources!': [
                 'browser/accessibility/dump_accessibility_tree_browsertest.cc',
                 'browser/accessibility/dump_accessibility_tree_helper.cc',
                 # These are included via dependency on content_common and hence
                 # we get multiple definition errors in a shared library build.
                 # Other builds need it as the symbols are not exported.
                 'common/content_constants_internal.cc',
                 'common/content_constants_internal.h',
               ],
               'sources': [
-                'shell/android/browsertests_apk/content_browser_tests_android.cc',
+                'shell/android/shell_library_loader.cc',
+                'shell/android/shell_library_loader.cc',
+                'shell/android/shell_manager.cc',
+                'shell/android/shell_manager.h',
               ],
               'dependencies': [
                 'content_shell_jni_headers',
-                'content_shell_lib',
               ],
             }],
             ['OS=="mac"', {
               'dependencies': [
                 'content_shell',  # Needed for Content Shell.app's Helper.
               ],
               'sources': [
                 'renderer/external_popup_menu_browsertest.cc',
               ],
             }],
@@ skipping 118 matching lines @@
           'dependencies': [
             'content_java',
             'content_unittests',
           ],
           'variables': {
             'test_suite_name': 'content_unittests',
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)content_unittests<(SHARED_LIB_SUFFIX)',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
-        {
-          'target_name': 'content_browsertests_apk',
-          'type': 'none',
-          'dependencies': [
-            'content_browsertests',
-            'content_java',
-            'content_shell_java',
-          ],
-          'variables': {
-            'package_name': 'content_browsertests_apk',
-            'apk_name': 'content_browsertests',
-            'java_in_dir': 'shell/android/browsertests_apk',
-            'resource_dir': 'res',
-            'native_libs_paths': ['<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)content_browsertests<(SHARED_LIB_SUFFIX)'],
-            'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'],
-            'asset_location': '<(ant_build_out)/content_shell/assets',
-          },
-          'includes': [ '../build/java_apk.gypi' ],
-        },
       ],
     }],
     ['OS == "android"', {
       'targets': [
         {
           'target_name': 'content_java_test_support',
           'type': 'none',
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:base_java_test_support',
             'content_common',
             'content_java',
           ],
           'variables': {
             'package_name': 'content_java_test_support',
             'java_in_dir': '../content/public/test/android/javatests',
           },
           'includes': [ '../build/java.gypi' ],
         },
         {
           'target_name': 'content_shell_test_apk',
           'type': 'none',
           'dependencies': [
             'content_java',
             'content_java_test_support',
-            'content_shell_apk_java',
+            'content_shell_java',
             '../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/forwarder2/forwarder.gyp:forwarder2',
           ],
           'variables': {
             'package_name': 'content_shell_test',
             'apk_name': 'ContentShellTest',
             'java_in_dir': '../content/shell/android/javatests',
-            'additional_src_dirs': ['../content/public/android/javatests/',],
-            'resource_dir': '../shell_apk/res',
+            'resource_dir': '../res',
+            'additional_src_dirs': ['../content/public/android/javatests/'],
             'is_test_apk': 1,
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
       ],
     }],
   ],
 }