Revert of Make secondary abi work for component build

build/android/gyp/write_build_config.py

 #!/usr/bin/env python
 #
 # Copyright 2014 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.
 
 """Writes a build_config file.
 
 The build_config file for a target is a json file containing information about
 how to build that target based on the target's dependencies. This includes
@@ skipping 191 matching lines @@
   for path in runtime_deps_files:
     with open(path) as f:
       for line in f:
         line = line.rstrip()
         if not line.endswith('.so'):
           continue
         ret.append(os.path.normpath(line))
   ret.reverse()
   return ret
 
-def _CreateJavaLibrariesList(library_paths):
-  """ Create a java literal array with the "base" library names:
-  e.g. libfoo.so -> foo
-  """
-  return ('{%s}' % ','.join(['"%s"' % s[3:-3] for s in library_paths]))
 
 def main(argv):
   parser = optparse.OptionParser()
   build_utils.AddDepfileOption(parser)
   parser.add_option('--build-config', help='Path to build_config output.')
   parser.add_option(
       '--type',
       help='Type of this target (e.g. android_library).')
   parser.add_option(
       '--deps-configs',
@@ skipping 35 matching lines @@
       help='GYP-list of .jar files to include on the classpath when compiling, '
            'but not to include in the final binary.')
 
   # android library options
   parser.add_option('--dex-path', help='Path to target\'s dex output.')
 
   # native library options
   parser.add_option('--shared-libraries-runtime-deps',
                     help='Path to file containing runtime deps for shared '
                          'libraries.')
-  parser.add_option('--secondary-abi-shared-libraries-runtime-deps',
-                    help='Path to file containing runtime deps for secondary '
-                         'abi shared libraries.')
 
   # apk options
   parser.add_option('--apk-path', help='Path to the target\'s apk output.')
   parser.add_option('--incremental-apk-path',
                     help="Path to the target's incremental apk output.")
   parser.add_option('--incremental-install-script-path',
                     help="Path to the target's generated incremental install "
                     "script.")
 
   parser.add_option('--tested-apk-config',
@@ skipping 345 matching lines @@
     if not options.tested_apk_config and manifest.GetInstrumentation():
       # This must then have instrumentation only for itself.
       manifest.CheckInstrumentation(manifest.GetPackageName())
 
     library_paths = []
     java_libraries_list = None
     runtime_deps_files = build_utils.ParseGnList(
         options.shared_libraries_runtime_deps or '[]')
     if runtime_deps_files:
       library_paths = _ExtractSharedLibsFromRuntimeDeps(runtime_deps_files)
-      java_libraries_list = _CreateJavaLibrariesList(library_paths)
-
-    secondary_abi_library_paths = []
-    secondary_abi_java_libraries_list = None
-    secondary_abi_runtime_deps_files = build_utils.ParseGnList(
-        options.secondary_abi_shared_libraries_runtime_deps or '[]')
-    if secondary_abi_runtime_deps_files:
-      secondary_abi_library_paths = _ExtractSharedLibsFromRuntimeDeps(
-          secondary_abi_runtime_deps_files)
-      secondary_abi_java_libraries_list = _CreateJavaLibrariesList(
-          secondary_abi_library_paths)
+      # Create a java literal array with the "base" library names:
+      # e.g. libfoo.so -> foo
+      java_libraries_list = ('{%s}' % ','.join(
+          ['"%s"' % s[3:-3] for s in library_paths]))
 
     all_inputs.extend(runtime_deps_files)
     config['native'] = {
       'libraries': library_paths,
-      'secondary_abi_libraries': secondary_abi_library_paths,
       'java_libraries_list': java_libraries_list,
-      'secondary_abi_java_libraries_list': secondary_abi_java_libraries_list,
     }
     config['assets'], config['uncompressed_assets'] = (
         _MergeAssets(deps.All('android_assets')))
 
   build_utils.WriteJson(config, options.build_config, only_if_changed=True)
 
   if options.depfile:
     build_utils.WriteDepfile(options.depfile, all_inputs)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))