Remove some obsolete TODO(GYP)s.

Since we didn't do them yet, they probably weren't important.

Bug: none
Change-Id: Ifbb2da04f2f6b0f3b125a7dbaa8ab732bd77fc6b
Reviewed-on: https://chromium-review.googlesource.com/1187013Reviewed-by: agrieve <agrieve@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#585578}

build/android/BUILD.gn

@@ -71,8 +71,8 @@ copy("cpplib_unstripped") {
 action("cpplib_stripped") {
   _strip_bin = "${android_tool_prefix}strip"
   _soname = "libc++_shared.so"
-  _input_so = "${root_shlib_dir}/lib.unstripped/${_soname}"
-  _output_so = "${root_shlib_dir}/${_soname}"
+  _input_so = "${root_out_dir}/lib.unstripped/${_soname}"
+  _output_so = "${root_out_dir}/${_soname}"
 
   deps = [
     ":cpplib_unstripped",

build/config/android/rules.gni

@@ -2272,7 +2272,7 @@ if (enable_java_templates) {
     if (_native_libs_deps != []) {
       if (_use_chromium_linker) {
         _extra_native_libs +=
-            [ "$root_shlib_dir/libchromium_android_linker$shlib_extension" ]
+            [ "$root_out_dir/libchromium_android_linker$shlib_extension" ]
         _extra_native_libs_deps +=
             [ "//base/android/linker:chromium_android_linker" ]
       }

build/config/gcc/BUILD.gn

@@ -65,11 +65,7 @@ config("symbol_visibility_default") {
 config("rpath_for_built_shared_libraries") {
   if (!is_android) {
     # Note: Android doesn't support rpath.
-    if (shlib_subdir != ".") {
-      rpath_link = "${shlib_subdir}/"
-    } else {
-      rpath_link = "."
-    }
+    rpath_link = "."
     if (current_toolchain != default_toolchain || gcc_target_rpath == "") {
       ldflags = [
         # Want to pass "\$". GN will re-escape as required for ninja.
@@ -112,9 +108,6 @@ config("executable_ldconfig") {
     # relative to the build directory. ${root_out_dir} will be a
     # subdirectory of ${root_build_dir} when cross compiling.
     _rpath_link = rebase_path(root_out_dir, root_build_dir)
-    if (shlib_subdir != ".") {
-      _rpath_link += "/$shlib_subdir"
-    }
     ldflags += [
       "-Wl,-rpath-link=$_rpath_link",
 

build/toolchain/gcc_toolchain.gni

@@ -402,9 +402,6 @@ template("gcc_toolchain") {
       default_output_extension = default_shlib_extension
 
       default_output_dir = "{{root_out_dir}}"
-      if (shlib_subdir != ".") {
-        default_output_dir += "/$shlib_subdir"
-      }
 
       output_prefix = "lib"
 
@@ -465,9 +462,6 @@ template("gcc_toolchain") {
       }
 
       default_output_dir = "{{root_out_dir}}"
-      if (shlib_subdir != ".") {
-        default_output_dir += "/$shlib_subdir"
-      }
 
       output_prefix = "lib"
 

build/toolchain/toolchain.gni

@@ -63,18 +63,6 @@ declare_args() {
 assert(!use_xcode_clang || target_os == "ios",
        "Using Xcode's clang is only supported in iOS builds")
 
-# Subdirectory within root_out_dir for shared library files.
-# TODO(agrieve): GYP sets this to "lib" for Linux & Android, but this won't work
-#     in GN until support for loadable_module() is added.
-#     See: https://codereview.chromium.org/1236503002/
-shlib_subdir = "."
-
-# Root out dir for shared library files.
-root_shlib_dir = root_out_dir
-if (shlib_subdir != ".") {
-  root_shlib_dir += "/$shlib_subdir"
-}
-
 # Extension for shared library files (including leading dot).
 if (is_mac || is_ios) {
   shlib_extension = ".dylib"