From dc6b0a7b9358335a3b66e7809a7c620f22c22261 Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Mon, 9 Nov 2015 14:03:46 -0800
Subject: [PATCH] Update Android.bp with latest Android.mk changes

Change-Id: I45f6292fcc4d4559519d88f948b4478204b08f25
---
 libc/Android.bp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libc/Android.bp b/libc/Android.bp
index 528dd47dd..d1228af14 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -9,7 +9,6 @@ libc_common_src_files = [
     "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 @@ cc_library_static {
         "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 @@ cc_library_static {
         "bionic/mkfifo.cpp",
         "bionic/mknod.cpp",
         "bionic/mntent.cpp",
+        "bionic/mremap.cpp",
         "bionic/NetdClientDispatch.cpp",
         "bionic/open.cpp",
         "bionic/pathconf.cpp",