commit 1d2b4c022c419e1e85336fa44e644772eefb8b64
author Dmitriy Ivanov <dimitry@google.com> Tue Jun 17 23:17:20 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 17 23:00:03 2014 +0000
tree dade083190ed15d8c224f1e0e96b1bd3062a16ad
parent b6ca7474023f7832d4230756781031b7687517e6
parent 1f5e1a3cbc564c593fe1090894ecdb070f36e20c

Merge "Move libraries for unit-tests to separate folder"

libc/include/sys/ioctl.h

diff --git a/libc/include/sys/ioctl.h b/libc/include/sys/ioctl.h
index 49d452c..a1014dc 100644
--- a/libc/include/sys/ioctl.h
+++ b/libc/include/sys/ioctl.h
@@ -38,6 +38,7 @@
 #include <asm/ioctls.h>
 #include <asm/termbits.h>
 #include <sys/ioctl_compat.h>
+#include <linux/tty.h>
 
 __BEGIN_DECLS
 

libm/Android.mk

diff --git a/libm/Android.mk b/libm/Android.mk
index b67395f..90b4906 100644
--- a/libm/Android.mk
+++ b/libm/Android.mk
@@ -1,3 +1,4 @@
+ifneq ($(TARGET_USE_PRIVATE_LIBM),true)
 LOCAL_PATH:= $(call my-dir)
 
 # TODO: this comes from from upstream's libc, not libm, but it's an
@@ -291,3 +292,4 @@
 LOCAL_SYSTEM_SHARED_LIBRARIES := libc
 LOCAL_WHOLE_STATIC_LIBRARIES := libm
 include $(BUILD_SHARED_LIBRARY)
+endif