Make secondary abi work for component build

build/android/BUILD.gn

Index: build/android/BUILD.gn
diff --git a/build/android/BUILD.gn b/build/android/BUILD.gn
index d0486020ad98226d49e8043562e397162e2c1224..5e906ac20a2bd1bb9cbab4822558f3c8df6abc9a 100644
--- a/build/android/BUILD.gn
+++ b/build/android/BUILD.gn
@@ -63,14 +63,14 @@ copy("cpplib_unstripped") {
     "${android_libcpp_lib_dir}/${_soname}",
   ]
   outputs = [
-    "${root_out_dir}/lib.unstripped/${_soname}",
+    "${root_shlib_dir}/lib.unstripped/${_soname}",

[agrieve, 2016/09/08 01:02:15]

nit: these should stay as root_out_dir. If root_shlib_dir ever becomes !=
root_out_dir, this will break (maybe what we'd want to add is a
"root_shlib_stripped_dir", but I doubt it's worth it at this point unless we're
going to update all the mentions.

[michaelbai, 2016/09/08 18:52:50]

the root_shlib_dir doesn't equal to root_out_dir for secondary toolchain, e.g.
root_shlib_dir is out/debug/arm, but root_out_dir is still out/debug.

[agrieve, 2016/09/08 18:57:18]

Are you sure? root_build_dir should be out/debug, but root_out_dir should be
out/debug/arm

If that's not the case, there is something subtle going on.

[michaelbai, 2016/09/08 19:03:41]

Yes, they are same for both toolchains, what could be wrong in your mind? or we
can only find out when we run into it.

[michaelbai, 2016/09/08 19:07:25]

Sorry, misread your comment, You are right, the root_build_dir is always
out/debug, but root_out_dir is out/debug/arm

   ]
 }
 
 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 = [
@@ -91,9 +91,9 @@ action("cpplib_stripped") {
     _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",