Fix sysroot_ld_path.sh to correctly process the included configs.

build/linux/sysroot_ld_path.sh

 #!/bin/sh
 # Copyright (c) 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.
 
 # Reads etc/ld.so.conf and/or etc/ld.so.conf.d/*.conf and returns the
 # appropriate linker flags.
 #
 #  sysroot_ld_path.sh /abspath/to/sysroot
 #
@@ skipping 28 matching lines @@
 
   # ld.so.conf may include relative include paths. pushd is a bashism.
   local saved_pwd=$(pwd)
   cd $(dirname "$ld_so_conf")
 
   cat "$ld_so_conf" | \
     while read ENTRY; do
       echo "$ENTRY" | grep -qs ^include
       if [ $? -eq 0 ]; then
         local included_files=$(echo "$ENTRY" | sed 's/^include //')
-        if ls $included_files >/dev/null 2>&1 ; then
-          for inc_file in $included_files; do
+        if ls $root$included_files >/dev/null 2>&1 ; then

[Lei Zhang, 2014/02/13 09:26:19]

In the absolute case, $included_files = /foo/*, we want to do:
ls $root/$included_files, which expands out to:
/abspath/to/sysroot/foo/*

but in the relative case, $included_files = bar/*, we want to do just:
ls $include_files, which expands out to:
bar/*

and that's fine because $PWD is already somewhere under /abspath/to/sysroot/etc

So what you want here is probably:

echo "$included_files" | grep -qs ^/
if [ $? -eq 0 ]; then
  for inc_file in $root$included_files; do
    process_ld_so_conf "$root" "$inc_file"
  done
else
  for inc_file in $(pwd)/$included_files; do
    process_ld_so_conf "$root" "$inc_file"
  done
fi

+          for inc_file in $root$included_files; do
             echo $inc_file | grep -qs ^/
             if [ $? -eq 0 ]; then
-              process_ld_so_conf "$root" "$root$inc_file"
+              process_ld_so_conf "$root" "$inc_file"
             else
               process_ld_so_conf "$root" "$(pwd)/$inc_file"
             fi
           done
         fi
         continue
       fi
 
       echo "$ENTRY" | grep -qs ^/
       if [ $? -eq 0 ]; then
@@ skipping 23 matching lines @@
 if [ -e "$LD_SO_CONF" ]; then
   process_ld_so_conf "$1" "$LD_SO_CONF" | xargs echo
 elif [ -e "$LD_SO_CONF_D" ]; then
   find "$LD_SO_CONF_D" -maxdepth 1 -name '*.conf' -print -quit > /dev/null
   if [ $? -eq 0 ]; then
     for entry in $LD_SO_CONF_D/*.conf; do
       process_ld_so_conf "$1" "$entry"
     done | xargs echo
   fi
 fi