Merge "Refactor prop_area into a class"
diff --git a/libc/Android.bp b/libc/Android.bp
index 528dd47..d1228af 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -9,7 +9,6 @@
"bionic/if_indextoname.c",
"bionic/if_nametoindex.c",
"bionic/initgroups.c",
- "bionic/ioctl.c",
"bionic/isatty.c",
"bionic/memmem.c",
"bionic/pututline.c",
@@ -1348,6 +1347,7 @@
"bionic/gettid.cpp",
"bionic/__gnu_basename.cpp",
"bionic/inotify_init.cpp",
+ "bionic/ioctl.cpp",
"bionic/lchown.cpp",
"bionic/lfs64_support.cpp",
"bionic/__libc_current_sigrtmax.cpp",
@@ -1367,6 +1367,7 @@
"bionic/mkfifo.cpp",
"bionic/mknod.cpp",
"bionic/mntent.cpp",
+ "bionic/mremap.cpp",
"bionic/NetdClientDispatch.cpp",
"bionic/open.cpp",
"bionic/pathconf.cpp",
diff --git a/tests/libgen_basename_test.cpp b/tests/libgen_basename_test.cpp
index 55939d1..d97e0da 100644
--- a/tests/libgen_basename_test.cpp
+++ b/tests/libgen_basename_test.cpp
@@ -42,6 +42,7 @@
#include <gtest/gtest.h>
static void __TestGnuBasename(const char* in, const char* expected_out, int line) {
+ errno = 0;
const char* out = gnu_basename(in);
ASSERT_STREQ(expected_out, out) << "(" << line << "): " << in << std::endl;
ASSERT_EQ(0, errno) << "(" << line << "): " << in << std::endl;