Reland of Make secondary abi work for component build

build/android/BUILD.gn

 # 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("//build/config/android/rules.gni")
 
 if (enable_java_templates) {
   import("//third_party/ijar/ijar.gni")
 
   sun_tools_jar_path = "$root_gen_dir/sun_tools_jar/tools.jar"
@@ skipping 52 matching lines @@
     "${android_libcpp_lib_dir}/${_soname}",
   ]
   outputs = [
     "${root_out_dir}/lib.unstripped/${_soname}",
   ]
 }
 
 action("cpplib_stripped") {
   _strip_bin = "${android_tool_prefix}strip"
   _soname = "libc++_shared.so"
-  _input_so = "${root_out_dir}/lib.unstripped/${_soname}"
+  _input_so = "${root_shlib_dir}/lib.unstripped/${_soname}"
   _output_so = "${root_shlib_dir}/${_soname}"
 
   deps = [
     ":cpplib_unstripped",
   ]
 
   script = "//build/gn_run_binary.py"
   inputs = [
     _strip_bin,
   ]
   sources = [
     _input_so,
   ]
   outputs = [
     _output_so,
   ]
   data = [
     _output_so,
   ]
 
-  _rebased_strip_bin = rebase_path(_strip_bin, root_out_dir)
-  _rebased_input_so = rebase_path(_input_so, root_out_dir)
-  _rebased_output_so = rebase_path(_output_so, root_out_dir)
+  _rebased_strip_bin = rebase_path(_strip_bin, root_build_dir)
+  _rebased_input_so = rebase_path(_input_so, root_build_dir)
+  _rebased_output_so = rebase_path(_output_so, root_build_dir)
   args = [
     _rebased_strip_bin,
     "--strip-unneeded",
     "-o",
     _rebased_output_so,
     _rebased_input_so,
   ]
 }
 
 group("test_runner_py") {
@@ skipping 41 matching lines @@
   _target_name = get_path_info(script, "name") + "_wrapper"
   _wrapper_targets += [ ":$_target_name" ]
   wrapper_script(_target_name) {
     target = script
   }
 }
 
 group("wrapper_scripts") {
   deps = _wrapper_targets
 }