commit 18c31d7f4c93309a0f316412fcc6a829e41eaaae
author Elliott Hughes <enh@google.com> Thu Aug 25 16:52:04 2016 -0700
committer Elliott Hughes <enh@google.com> Thu Aug 25 17:25:31 2016 -0700
tree bed799dc0e863dc329b519b798d006479ddaaa3e
parent e1d792b10c0c825e271cb1f729dcdafa35583722

Switch back to the BSD exec for now.

Bug: http://b/31091962
Change-Id: Ia155c4aa0d6db7b91d7486433c3c01a841b0e509

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index 4fcd83e..52006a4 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -518,6 +518,7 @@
     name: "libc_openbsd_large_stack",
     defaults: ["libc_defaults"],
     srcs: [
+        "upstream-openbsd/lib/libc/gen/exec.c",
         "upstream-openbsd/lib/libc/stdio/vfprintf.c",
         "upstream-openbsd/lib/libc/stdio/vfwprintf.c",
         "upstream-openbsd/lib/libc/stdio/vfwscanf.c",
@@ -1237,7 +1238,6 @@
         "bionic/error.cpp",
         "bionic/eventfd_read.cpp",
         "bionic/eventfd_write.cpp",
-        "bionic/exec.cpp",
         "bionic/faccessat.cpp",
         "bionic/fchmod.cpp",
         "bionic/fchmodat.cpp",