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

build/config/android/rules.gni

 # 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.
 
 import("//base/android/linker/config.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//third_party/android_platform/config.gni")
 import("//tools/grit/grit_rule.gni")
 
@@ skipping 1414 matching lines @@
     }
 
     _enable_relocation_packing = false
     if (defined(invoker.enable_relocation_packing) &&
         invoker.enable_relocation_packing) {
       _enable_relocation_packing = relocation_packing_supported
       assert(_use_chromium_linker,
              "Relocation packing requires use of the" + " Chromium linker.")
     }
 
-    _native_libs = process_file_template(
+    _native_libs = []
+    if (is_component_build) {
+      _native_libs += [ "$root_out_dir/lib.stripped/libc++_shared.so" ]
+      _chromium_linker_dep += [ "//build/android:cpplib_stripped" ]
+    }
+    _native_libs += process_file_template(
             invoker.native_libs,
             "$root_build_dir/lib.stripped/{{source_file_part}}")
 
     _native_libs_dir = base_path + "/libs"
 
     if (_use_chromium_linker) {
       _native_libs +=
           [ "$root_build_dir/lib.stripped/libchromium_android_linker.so" ]
     }
 
@@ skipping 632 matching lines @@
     testonly = invoker.testonly
   }
 
   dist_dir = invoker.dist_dir
   binary = invoker.binary
   template_name = target_name
 
   libraries_list =
       "${target_gen_dir}/${template_name}_library_dependencies.list"
 
-  # TODO(gyp)
-  #'dependencies': [
-  #'<(DEPTH)/build/android/setup.gyp:copy_system_libraries',
-  #],
-
   find_deps_target_name = "${template_name}__find_library_dependencies"
   copy_target_name = "${template_name}__copy_libraries_and_exe"
 
   stripped_libraries_dir = "$root_build_dir/lib.stripped"
   action(find_deps_target_name) {
     visibility = [ ":$copy_target_name" ]
 
     script = "//build/android/gyp/write_ordered_libraries.py"
     depfile = "$target_gen_dir/$target_name.d"
     inputs = [
@@ skipping 27 matching lines @@
     clear_dir = true
     inputs = [
       binary,
       libraries_list,
     ]
     dest = dist_dir
     rebased_binaries_list = rebase_path([ binary ], root_build_dir)
     rebased_libraries_list = rebase_path(libraries_list, root_build_dir)
     args = [
       "--files=$rebased_binaries_list",
-      "--files=@FileArg($rebased_libraries_list:libraries)",
+      "--files=@FileArg($rebased_libraries_list:lib_paths)",
     ]
 
     deps = [
       ":$find_deps_target_name",
     ]
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
   }
 
@@ skipping 67 matching lines @@
 template("uiautomator_test") {
   set_sources_assignment_filter([])
   if (defined(invoker.testonly)) {
     testonly = invoker.testonly
   }
   assert(target_name != "")
   assert(invoker.deps != [] || true)
   group(target_name) {
   }
 }