Remove shim classes etc. that were needed to move Android Loader

build/java_apk.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.
 
 # This file is meant to be included into a target to provide a rule
 # to build Android APKs in a consistent manner.
 #
 # To use this, create a gyp target with the following form:
 # {
 #   'target_name': 'my_package_apk',
@@ skipping 105 matching lines @@
     'source_dir': '<(java_in_dir)/src',
     'apk_install_record': '<(intermediate_dir)/apk_install.record.stamp',
     'device_intermediate_dir': '/data/local/tmp/chromium/<(_target_name)/<(CONFIGURATION_NAME)',
     'symlink_script_host_path': '<(intermediate_dir)/create_symlinks.sh',
     'symlink_script_device_path': '<(device_intermediate_dir)/create_symlinks.sh',
     'create_standalone_apk%': 1,
     'variables': {
       'variables': {
         'native_lib_target%': '',
         'native_lib_version_name%': '',
-        # TODO (aberent) remove use_content_linker once downstream Android has
-        # been switched to use_chromium_linker.
-        'use_content_linker%': 0,
         'use_chromium_linker%' : 0,
         'enable_chromium_linker_tests%': 0,
         'is_test_apk%': 0,
       },
       'conditions': [
         ['gyp_managed_install == 1 and native_lib_target != ""', {
           'unsigned_standalone_apk_path': '<(intermediate_dir)/<(apk_name)-standalone-unsigned.apk',
         }, {
           'unsigned_standalone_apk_path': '<(unsigned_apk_path)',
         }],
         ['gyp_managed_install == 1', {
           'apk_package_native_libs_dir': '<(intermediate_dir)/libs.managed',
         }, {
           'apk_package_native_libs_dir': '<(intermediate_dir)/libs',
         }],
         ['is_test_apk == 0 and emma_coverage != 0', {
           'emma_instrument': 1,
         },{
           'emma_instrument': 0,
         }],
       ],
     },
     'native_lib_target%': '',
     'native_lib_version_name%': '',
-    'use_content_linker%': 0,
     'use_chromium_linker%' : 0,
     'enable_chromium_linker_tests%': 0,
     'emma_instrument': '<(emma_instrument)',
     'apk_package_native_libs_dir': '<(apk_package_native_libs_dir)',
     'unsigned_standalone_apk_path': '<(unsigned_standalone_apk_path)',
     'extra_native_libs': [],
   },
   # Pass the jar path to the apk's "fake" jar target.  This would be better as
   # direct_dependent_settings, but a variable set by a direct_dependent_settings
   # cannot be lifted in a dependent to all_dependent_settings.
@@ skipping 15 matching lines @@
         'additional_res_dirs': ['<(DEPTH)/build/android/ant/empty/res'],
         'additional_res_packages': ['<(R_package)'],
         'additional_R_text_files': ['<(PRODUCT_DIR)/<(package_name)/R.txt'],
       },
     }],
     ['native_lib_target != "" and component == "shared_library"', {
       'dependencies': [
         '<(DEPTH)/build/android/setup.gyp:copy_system_libraries',
       ],
     }],
-    ['use_content_linker == 1 or use_chromium_linker == 1', {
+    ['use_chromium_linker == 1', {
       'dependencies': [
         '<(DEPTH)/base/base.gyp:chromium_android_linker',
       ],
     }],
     ['native_lib_target != ""', {
       'variables': {
         'compile_input_paths': [ '<(native_libraries_java_stamp)' ],
         'generated_src_dirs': [ '<(native_libraries_java_dir)' ],
         'native_libs_paths': [
           '<(SHARED_LIB_DIR)/<(native_lib_target).>(android_product_extension)'
@@ skipping 11 matching lines @@
           'files': [
             '<(android_gdbserver)',
             '<@(extra_native_libs)',
           ],
         },
       ],
       'actions': [
         {
           'variables': {
             'conditions': [
-              ['use_content_linker == 1 or use_chromium_linker == 1', {
+              ['use_chromium_linker == 1', {
                 'variables': {
                   'linker_input_libraries': [
                     '<(SHARED_LIB_DIR)/libchromium_android_linker.>(android_product_extension)',
                   ],
                 }
               }, {
                 'variables': {
                   'linker_input_libraries': [],
                 },
               }],
@@ skipping 23 matching lines @@
             '--ordered-libraries=<(ordered_libraries_file)',
             '--version-name=<(native_lib_version_name)',
             '--native-library-list=<(native_libraries_template_data_file)',
             '--version-output=<(native_libraries_template_version_file)',
           ],
         },
         {
           'action_name': 'native_libraries_<(_target_name)',
           'variables': {
             'conditions': [
-              ['use_content_linker == 1 or use_chromium_linker == 1', {
+              ['use_chromium_linker == 1', {
                 'variables': {
                   'linker_gcc_preprocess_defines': [
                     '--defines', 'ENABLE_CHROMIUM_LINKER',
                   ],
                 }
               }, {
                 'variables': {
                   'linker_gcc_preprocess_defines': [],
                 },
               }],
@@ skipping 495 matching lines @@
         '<(DEPTH)/build/android/ant/apk-package.xml',
 
         # Add list of inputs to the command line, so if inputs change
         # (e.g. if a Java file is removed), the command will be re-run.
         # TODO(newt): remove this once crbug.com/177552 is fixed in ninja.
         '-DTHIS_IS_IGNORED=>!(echo \'>(_inputs)\' | md5sum)',
       ]
     },
   ],
 }