Merge remote-tracking branch 'aosp/upstream' am: d120bfe213 am: 50e090d607 am: fded9df028

am: 1cda3744fc

Change-Id: Ib7dcf24d850161ca710660917d194395e03a4ac2

3 files changed, 3 insertions, 5 deletions

diff --git a/Android.bp b/Android.bp
index 8dbb9cb..ab91582 100644
--- a/Android.bp
+++ b/Android.bp
@@ -20,11 +20,6 @@ cc_defaults {
         "-Werror",
         "-DNOLOG",
     ],
-    target: {
-        linux: {
-            host_ldlibs: ["-lrt", "-lpthread"],
-        },
-    },
     tidy_checks: [
         "-google-global-names-in-headers",
         "-google-build-using-namespace",
diff --git a/exec.cc b/exec.cc
index 1569519..fa534d5 100644
--- a/exec.cc
+++ b/exec.cc
@@ -18,6 +18,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <sys/wait.h>
 
 #include <memory>
 #include <unordered_map>
diff --git a/runtest.rb b/runtest.rb
index 190c11f..7bc552d 100755
--- a/runtest.rb
+++ b/runtest.rb
@@ -177,6 +177,8 @@ def normalize_kati_log(output)
   # Normalization for "include foo" with Go kati.
   output.gsub!(/(: )open (\S+): n(o such file or directory)\nNOTE:.*/,
                "\\1\\2: N\\3")
+  # Bionic libc has different error messages than glibc
+  output.gsub!(/Too many symbolic links encountered/, 'Too many levels of symbolic links')
   output
 end