summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYabin Cui <yabinc@google.com>2014-11-19 04:31:49 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-19 04:31:49 +0000
commita9653012fba44d1634c2cf85bfd3ef8559d6a6da (patch)
tree1f4e674e276b736776d9230048c7951a795d8c79
parent0217e3b20b6a331b0820014dc136d782070bca45 (diff)
parent9f7c5fef0e7c00d00c67242c2a360911b53374e0 (diff)
downloadbuild-a9653012fba44d1634c2cf85bfd3ef8559d6a6da.zip
build-a9653012fba44d1634c2cf85bfd3ef8559d6a6da.tar.gz
build-a9653012fba44d1634c2cf85bfd3ef8559d6a6da.tar.bz2
am 9f7c5fef: Merge "kill HAVE_MADVISE"
* commit '9f7c5fef0e7c00d00c67242c2a360911b53374e0': kill HAVE_MADVISE
-rw-r--r--core/combo/include/arch/darwin-x86/AndroidConfig.h5
-rw-r--r--core/combo/include/arch/linux-arm/AndroidConfig.h5
-rw-r--r--core/combo/include/arch/linux-arm64/AndroidConfig.h5
-rw-r--r--core/combo/include/arch/linux-mips/AndroidConfig.h5
-rw-r--r--core/combo/include/arch/linux-mips64/AndroidConfig.h5
-rw-r--r--core/combo/include/arch/linux-x86/AndroidConfig.h5
-rw-r--r--core/combo/include/arch/target_linux-x86/AndroidConfig.h5
7 files changed, 0 insertions, 35 deletions
diff --git a/core/combo/include/arch/darwin-x86/AndroidConfig.h b/core/combo/include/arch/darwin-x86/AndroidConfig.h
index c83c54c..c2bad7b 100644
--- a/core/combo/include/arch/darwin-x86/AndroidConfig.h
+++ b/core/combo/include/arch/darwin-x86/AndroidConfig.h
@@ -89,11 +89,6 @@
/* #define HAVE_MALLOC_H */
/*
- * Define if we have madvise() in <sys/mman.h>
- */
-#define HAVE_MADVISE 1
-
-/*
* Define if we include <sys/mount.h> for statfs()
*/
#define INCLUDE_SYS_MOUNT_FOR_STATFS 1
diff --git a/core/combo/include/arch/linux-arm/AndroidConfig.h b/core/combo/include/arch/linux-arm/AndroidConfig.h
index bb47ef0..e9550aa 100644
--- a/core/combo/include/arch/linux-arm/AndroidConfig.h
+++ b/core/combo/include/arch/linux-arm/AndroidConfig.h
@@ -88,11 +88,6 @@
#define HAVE_LINUX_LOCAL_SOCKET_NAMESPACE 1
/*
- * Define if we have madvise() in <sys/mman.h>
- */
-#define HAVE_MADVISE 1
-
-/*
* Define if libc includes Android system properties implementation.
*/
#define HAVE_LIBC_SYSTEM_PROPERTIES 1
diff --git a/core/combo/include/arch/linux-arm64/AndroidConfig.h b/core/combo/include/arch/linux-arm64/AndroidConfig.h
index e4f98e0..913e38b 100644
--- a/core/combo/include/arch/linux-arm64/AndroidConfig.h
+++ b/core/combo/include/arch/linux-arm64/AndroidConfig.h
@@ -86,11 +86,6 @@
#define HAVE_LINUX_LOCAL_SOCKET_NAMESPACE 1
/*
- * Define if we have madvise() in <sys/mman.h>
- */
-#define HAVE_MADVISE 1
-
-/*
* Define if libc includes Android system properties implementation.
*/
#define HAVE_LIBC_SYSTEM_PROPERTIES 1
diff --git a/core/combo/include/arch/linux-mips/AndroidConfig.h b/core/combo/include/arch/linux-mips/AndroidConfig.h
index e8b39f4..e0f4cf5 100644
--- a/core/combo/include/arch/linux-mips/AndroidConfig.h
+++ b/core/combo/include/arch/linux-mips/AndroidConfig.h
@@ -106,11 +106,6 @@
#define HAVE_LINUX_LOCAL_SOCKET_NAMESPACE 1
/*
- * Define if we have madvise() in <sys/mman.h>
- */
-#define HAVE_MADVISE 1
-
-/*
* Define if libc includes Android system properties implementation.
*/
#define HAVE_LIBC_SYSTEM_PROPERTIES 1
diff --git a/core/combo/include/arch/linux-mips64/AndroidConfig.h b/core/combo/include/arch/linux-mips64/AndroidConfig.h
index 3d258ea..9fa0d67 100644
--- a/core/combo/include/arch/linux-mips64/AndroidConfig.h
+++ b/core/combo/include/arch/linux-mips64/AndroidConfig.h
@@ -96,11 +96,6 @@
#define HAVE_LINUX_LOCAL_SOCKET_NAMESPACE 1
/*
- * Define if we have madvise() in <sys/mman.h>
- */
-#define HAVE_MADVISE 1
-
-/*
* Define if libc includes Android system properties implementation.
*/
#define HAVE_LIBC_SYSTEM_PROPERTIES 1
diff --git a/core/combo/include/arch/linux-x86/AndroidConfig.h b/core/combo/include/arch/linux-x86/AndroidConfig.h
index c732e83..b3544ce 100644
--- a/core/combo/include/arch/linux-x86/AndroidConfig.h
+++ b/core/combo/include/arch/linux-x86/AndroidConfig.h
@@ -86,11 +86,6 @@
#define ARCH_X86
/*
- * Define if we have madvise() in <sys/mman.h>
- */
-#define HAVE_MADVISE 1
-
-/*
* Define if system provides a system property server (should be
* mutually exclusive with HAVE_LIBC_SYSTEM_PROPERTIES).
*/
diff --git a/core/combo/include/arch/target_linux-x86/AndroidConfig.h b/core/combo/include/arch/target_linux-x86/AndroidConfig.h
index 4a918e6..2b3fc3a 100644
--- a/core/combo/include/arch/target_linux-x86/AndroidConfig.h
+++ b/core/combo/include/arch/target_linux-x86/AndroidConfig.h
@@ -80,11 +80,6 @@
#define HAVE_LINUX_LOCAL_SOCKET_NAMESPACE 1
/*
- * Define if we have madvise() in <sys/mman.h>
- */
-#define HAVE_MADVISE 1
-
-/*
* Define if libc includes Android system properties implementation.
*/
#define HAVE_LIBC_SYSTEM_PROPERTIES 1