Android GN: Include libstdc++.so when doing a component build

build/android/gyp/write_ordered_libraries.py

 #!/usr/bin/env python
 #
 # Copyright 2013 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 dependency ordered list of native libraries.
 
 The list excludes any Android system libraries, as those are not bundled with
 the APK.
@@ skipping 55 matching lines @@
                  FullLibraryPath(library_or_executable)]
   return build_utils.CheckOutput(readelf_cmd)
 
 
 def GetDependencies(library_or_executable):
   elf = CallReadElf(library_or_executable)
   return set(_library_re.findall(elf))
 
 
 def GetNonSystemDependencies(library_name):
-  all_deps = GetDependencies(FullLibraryPath(library_name))
+  all_deps = GetDependencies(library_name)
   return set((lib for lib in all_deps if not IsSystemLibrary(lib)))
 
 
 def GetSortedTransitiveDependencies(libraries):
   """Returns all transitive library dependencies in dependency order."""
   return build_utils.GetSortedTransitiveDependencies(
       libraries, GetNonSystemDependencies)
 
 
 def GetSortedTransitiveDependenciesForBinaries(binaries):
@@ skipping 25 matching lines @@
   SetLibraryDirs(options.libraries_dir.split(','))
 
   libraries = build_utils.ParseGypList(options.input_libraries)
   if len(libraries):
     libraries = GetSortedTransitiveDependenciesForBinaries(libraries)
 
   # Convert to "base" library names: e.g. libfoo.so -> foo
   java_libraries_list = (
       '{%s}' % ','.join(['"%s"' % s[3:-3] for s in libraries]))
 
+  out_json = {
+      'libraries': libraries,
+      'lib_paths': [FullLibraryPath(l) for l in libraries],
+      'java_libraries_list': java_libraries_list
+      }
   build_utils.WriteJson(
-      {'libraries': libraries, 'java_libraries_list': java_libraries_list},
+      out_json,
       options.output,
       only_if_changed=True)
 
   if options.stamp:
     build_utils.Touch(options.stamp)
 
   if options.depfile:
     build_utils.WriteDepfile(
         options.depfile,
         libraries + build_utils.GetPythonDependencies())
 
 
 if __name__ == '__main__':
   sys.exit(main())